From: Felipe Pena <felipe@php.net>
Date: Wed, 7 Jan 2009 20:21:46 +0000 (+0000)
Subject: MFH:
X-Git-Tag: php-5.3.0beta1~246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c989115c233f510aae1d37ef77653b4bce4753f;p=php

MFH:
- Added check for EWOULDBLOCK
- Using EWOULDBLOCK instead of EAGAIN by portability issues
(Related to #46917)
---

diff --git a/main/php_network.h b/main/php_network.h
index 02e2b8ef6b..9f552f352b 100644
--- 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
index 04a59426c3..deafb9106c 100644
--- 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;
 					}
 				}