From: Wez Furlong <wez@php.net>
Date: Sat, 10 Jul 2004 10:54:27 +0000 (+0000)
Subject: MFH: RIP: Greedy read problems
X-Git-Tag: php-4.3.9RC1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fb029f2578e4bf8b27fac607384f9b43027e849;p=php

MFH: RIP: Greedy read problems
---

diff --git a/main/streams.c b/main/streams.c
index b5e7be49f8..4a1be60af4 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -55,6 +55,8 @@
 
 #define PHP_STDIOP_GET_FD(anfd, data)   anfd = (data)->file ? fileno((data)->file) : (data)->fd
 
+static php_stream_wrapper php_plain_files_wrapper;
+
 /* {{{ some macros to help track leaks */
 #if ZEND_DEBUG
 #define emalloc_rel_orig(size)	\
@@ -648,7 +650,8 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
 		}
 
 		/* just break anyway, to avoid greedy read */
-		break;
+		if (stream->wrapper != &php_plain_files_wrapper)
+			break;
 	}
 
 	if (didread > 0)