summaryrefslogtreecommitdiff
path: root/main/streams/streams.c
diff options
context:
space:
mode:
authorDavid Soria Parra <dsp@php.net>2008-08-26 16:06:23 +0000
committerDavid Soria Parra <dsp@php.net>2008-08-26 16:06:23 +0000
commitedc3fff0ff516a34349f04c77cba5b1d76cabd6e (patch)
tree887544fcf5146dd8cfc111d84f674e9630813c1c /main/streams/streams.c
parentcf06da29a524e1e61731d6001863b0e2f693686f (diff)
downloadphp-git-edc3fff0ff516a34349f04c77cba5b1d76cabd6e.tar.gz
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.
Diffstat (limited to 'main/streams/streams.c')
-rwxr-xr-xmain/streams/streams.c2
1 files changed, 1 insertions, 1 deletions
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;
}