Patch ignore-EINPROGRESS-warning-nonblocking-2 for Sockets related Bug #63570

Patch version 2012-11-28 12:41 UTC

Obsoleted by patches:

• ignore-warnings-for-nonblocking, revision 2012-12-03 11:54 UTC

Obsolete patches:

• ignore-EINPROGRESS-warning, revision 2012-11-28 12:33 UTC
• ignore-EINPROGRESS-warning-nonblocking, revision 2012-11-28 12:40 UTC

• 2012-11-28 12:41 UTC [diff to current]

Developer: osmanov@php.net

--- sockets.c	2012-11-28 01:39:22.000000000 +0500
+++ /tmp/sockets.c	2012-11-28 17:39:31.097908446 +0500
@@ -118,9 +118,15 @@
 #define PHP_NORMAL_READ 0x0001
 #define PHP_BINARY_READ 0x0002
 
-#define PHP_SOCKET_ERROR(socket,msg,errn)	socket->error = errn;	\
-						SOCKETS_G(last_error) = errn; \
-						php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, errn, php_strerror(errn TSRMLS_CC))
+#define PHP_SOCKET_ERROR(socket,msg,errn) \
+	do { \
+		socket->error = errn;	\
+		SOCKETS_G(last_error) = errn; \
+		if (errn != EINPROGRESS && socket->blocking == 0) { \
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, \
+					"%s [%d]: %s", msg, errn, php_strerror(errn TSRMLS_CC)); \
+		} \
+	while (0)
 
 static int le_socket;
 #define le_socket_name php_sockets_le_socket_name