diff options
| author | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
| commit | 2876046398950e59c3b3c460e67e6fec7ff2ba3c (patch) | |
| tree | 33b2b8b4b859960a6446ad19d0ada1c55f9cfcda /main/streams/xp_socket.c | |
| parent | 3fb86b0b9e79e6a3312b694f30ee627e2e1b325c (diff) | |
| download | php-git-php-5.3.0alpha2.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2
Diffstat (limited to 'main/streams/xp_socket.c')
| -rw-r--r-- | main/streams/xp_socket.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index a7736878f4..0684d1ae76 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -280,8 +280,12 @@ 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) { + } 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 { alive = 0; } } |