summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2004-07-10 10:54:09 +0000
committerWez Furlong <wez@php.net>2004-07-10 10:54:09 +0000
commitcd732f1a3f5df97407797fe7ebb97830552479ad (patch)
treea7d03e94d0c7ad3a145a88c00370e6e8f4bc4077
parente5cfb1d05cf10fa694f231dae33ccb03ab8f74c8 (diff)
downloadphp-git-cd732f1a3f5df97407797fe7ebb97830552479ad.tar.gz
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.
-rwxr-xr-xmain/streams/streams.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 3ba75a0845..86f78847dd 100755
--- 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) {