diff options
| author | Anatol Belski <ab@php.net> | 2015-08-11 17:36:10 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-08-11 17:36:10 +0200 |
| commit | 797e30f4fc9fae94b92e314aac9a16cff2d5b50b (patch) | |
| tree | 99214e0618c7324accb669f293443f8b4121b3e1 | |
| parent | 87db2e4a9157d8875cffa119f21f9e356713a511 (diff) | |
| download | php-git-797e30f4fc9fae94b92e314aac9a16cff2d5b50b.tar.gz | |
Fixed bug #70198 Checking liveness does not work as expected
| -rw-r--r-- | main/streams/xp_socket.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index ee06f26bf2..c4846d8541 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -293,7 +293,17 @@ 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() != EWOULDBLOCK) { +#ifdef PHP_WIN32 + int ret; +#else + ssize_t ret; +#endif + int err; + + ret = recv(sock->socket, &buf, sizeof(buf), MSG_PEEK); + err = php_socket_errno(); + if (0 == ret || /* the counterpart did properly shutdown*/ + 0 > ret && err != EWOULDBLOCK && err != EAGAIN) { /* there was an unrecoverable error */ alive = 0; } } |