diff options
| author | David Soria Parra <dsp@php.net> | 2008-11-24 15:36:47 +0000 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2008-11-24 15:36:47 +0000 |
| commit | a9282f72a87df3f6a87084ee6c7c9ed92decea76 (patch) | |
| tree | 4508d0750c4f72291a99a9b5d85bfdb14ae05b99 /main/streams/xp_socket.c | |
| parent | db0376cf94bb7c4f5b69f35440ccc45f5338fc57 (diff) | |
| download | php-git-a9282f72a87df3f6a87084ee6c7c9ed92decea76.tar.gz | |
MFH: Revert fix for 43782, as it caused problems.
Diffstat (limited to 'main/streams/xp_socket.c')
| -rw-r--r-- | main/streams/xp_socket.c | 8 |
1 files changed, 2 insertions, 6 deletions
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; } } |