From: David Soria Parra <dsp@php.net>
Date: Tue, 26 Aug 2008 16:06:23 +0000 (+0000)
Subject: Fixed bug #43782 (feof() does not detect timeout on socket)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~565
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edc3fff0ff516a34349f04c77cba5b1d76cabd6e;p=php

Fixed bug #43782 (feof() does not detect timeout on socket)
# Poll returns 0 if it times out.
# We check for 0 and use the user set timeout in set_options by passing -1.
---

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 3d7d251ee3..8ca087727a 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -831,7 +831,7 @@ PHPAPI int _php_stream_eof(php_stream *stream TSRMLS_DC)
 	/* use the configured timeout when checking eof */
 	if (!stream->eof && PHP_STREAM_OPTION_RETURN_ERR ==
 		   	php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS,
-		   	0, NULL)) {
+		   	-1, NULL)) {
 		stream->eof = 1;
 	}
 
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index a51c704e63..ab304e1f8d 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;
 					}
 				}