From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 23 Sep 2009 10:25:54 +0000 (+0000)
Subject: Fixed ext/standard/tests/streams/stream_get_contents_002.phpt
X-Git-Tag: php-5.4.0alpha1~191^2~2602
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f6f23dc14e0f7c15a94893771243e399610f175;p=php

Fixed ext/standard/tests/streams/stream_get_contents_002.phpt
---

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