]> granicus.if.org Git - php/commitdiff
Fixed ext/standard/tests/streams/stream_get_contents_002.phpt
authorDmitry Stogov <dmitry@php.net>
Wed, 23 Sep 2009 10:25:54 +0000 (10:25 +0000)
committerDmitry Stogov <dmitry@php.net>
Wed, 23 Sep 2009 10:25:54 +0000 (10:25 +0000)
main/streams/xp_socket.c

index 244d3c37e1584ead69be8101de0d84a5be61b78f..1526422dbc4fa44ff6c6db3ee70298f3e91bf7af 100644 (file)
@@ -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;
                                        }
                                }