MFH:

- Added check for EWOULDBLOCK - Using EWOULDBLOCK instead of EAGAIN by portability issues (Related to #46917)
chobie · Jan 7, 2009 · 7c98911 · 7c98911
1 parent c7ef31a
commit 7c98911
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/main/php_network.h b/main/php_network.h
@@ -40,6 +40,10 @@
 #	define ftruncate(a, b) chsize(a, b)
 #endif /* defined(PHP_WIN32) */
 
+#ifndef EWOULDBLOCK
+# define EWOULDBLOCK EAGAIN
+#endif
+
 #ifdef PHP_WIN32
 #define php_socket_errno() WSAGetLastError()
 #else

diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
@@ -281,7 +281,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
 				if (sock->socket == -1) {
 					alive = 0;
 				} else if (php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
-					if (0 == recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
+					if (0 == recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) {
 						alive = 0;
 					}
 				}