From: Wez Furlong <wez@php.net>
Date: Wed, 8 Oct 2003 10:58:28 +0000 (+0000)
Subject: Backport from HEAD; set EOF marker after each read attempt to avoid it
X-Git-Tag: php-4.3.4RC2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b2def80d0a171b3c93410aba840c292dbd42d1d;p=php

Backport from HEAD; set EOF marker after each read attempt to avoid it
being stuck in the on position.
Partial "fix" for #25649.
---

diff --git a/main/streams.c b/main/streams.c
index 5d81315642..4903d6e9e4 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -1460,8 +1460,7 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count TSRMLS
 	if (data->fd >= 0) {
 		ret = read(data->fd, buf, count);
 		
-		if (ret == 0 || (ret == -1 && errno != EWOULDBLOCK))
-			stream->eof = 1;
+		stream->eof = (ret == 0 || (ret == -1 && errno != EWOULDBLOCK));
 				
 	} else {
 #if HAVE_FLUSHIO
@@ -1472,8 +1471,7 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count TSRMLS
 
 		ret = fread(buf, 1, count, data->file);
 
-		if (feof(data->file))
-			stream->eof = 1;
+		stream->eof = feof(data->file);
 	}
 	return ret < 0 ? 0 : ret;
 }