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 e84fac181e317e7c918a0d9450e2269b65873989..b073ae57cc23750ac087a62e7f1ee1247a47495e 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -53,6 +53,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 6da70d199575b905471ba390673ea46bf7e58f37..eee8a7a5c45b8b7b72a9d0b14bc22984ca2070dd 100644 (file)
--- 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;
                                        }
                                }