From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 4 Dec 2005 17:31:40 +0000 (+0000)
Subject: MFB51: Fixed bug #35062 (socket_read() produces warnings on non blocking
X-Git-Tag: RELEASE_1_1_1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08c824bbea992b823404d0cc99b0f4462d73085c;p=php

MFB51: Fixed bug #35062 (socket_read() produces warnings on non blocking
sockets).
---

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 9987856058..2b7085c18d 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -859,7 +859,19 @@ PHP_FUNCTION(socket_read)
 	}
 
 	if (retval == -1) {
-		PHP_SOCKET_ERROR(php_sock, "unable to read from socket", errno);
+		/* if the socket is in non-blocking mode and there's no data to read,
+		don't output any error, as this is a normal situation, and not an error */
+		if (errno == EAGAIN
+#ifdef EWOULDBLOCK
+		|| errno == EWOULDBLOCK
+#endif
+		) {
+			php_sock->error = errno;
+			SOCKETS_G(last_error) = errno;
+		} else {
+			PHP_SOCKET_ERROR(php_sock, "unable to read from socket", errno);
+		}
+
 		efree(tmpbuf);
 		RETURN_FALSE;
 	}