From a9282f72a87df3f6a87084ee6c7c9ed92decea76 Mon Sep 17 00:00:00 2001 From: David Soria Parra Date: Mon, 24 Nov 2008 15:36:47 +0000 Subject: MFH: Revert fix for 43782, as it caused problems. --- main/streams/xp_socket.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'main/streams/xp_socket.c') diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 0684d1ae76..a7736878f4 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -280,12 +280,8 @@ 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) { - alive = 0; - } - } else { + } 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) { alive = 0; } } -- cgit v1.2.1