RIP: greedy ready problems

This allows people to use fread($fp, filesize($filename)) for regular files,
but packet-based non-greedy reads for everything else.

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 3ba75a0845688a5858a47c3c1b606b70b993ab5a..86f78847ddba626ecb49f520286dc2cd5253bf09 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -592,7 +592,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) {