From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 8 Feb 2009 16:54:43 +0000 (+0000)
Subject: MFB52: Fixed bug #44874 (dead pfsockopen'ed sockets aren't reaped when the
X-Git-Tag: php-5.2.9RC2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcc80dcb86ba4af5fb516bb7d2a95bb50f90e324;p=php

MFB52: Fixed bug #44874 (dead pfsockopen'ed sockets aren't reaped when the
remote end restarts)

# Patch by Richard dot Krehbiel at gmail dot com
---

diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index eee8a7a5c4..aecc425ba1 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() != EWOULDBLOCK) {
+					if (0 >= recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) {
 						alive = 0;
 					}
 				}