diff options
Diffstat (limited to 'main/streams.c')
| -rwxr-xr-x | main/streams.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/main/streams.c b/main/streams.c index 6198ca8321..177e78ba2b 100755 --- a/main/streams.c +++ b/main/streams.c @@ -544,7 +544,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS if (toread > size) toread = size; - if (toread) { + if (toread > 0) { memcpy(buf, stream->readbuf + stream->readpos, toread); stream->readpos += toread; } @@ -572,14 +572,6 @@ PHPAPI int _php_stream_eof(php_stream *stream TSRMLS_DC) return 0; return stream->eof; - - /* we define our stream reading function so that it - must return EOF when an EOF condition occurs, when - working in unbuffered mode and called with these args */ - if (stream->filterhead) - return stream->filterhead->fops->eof(stream, stream->filterhead TSRMLS_CC); - - return stream->ops->read(stream, NULL, 0 TSRMLS_CC) == EOF ? 1 : 0; } PHPAPI int _php_stream_putc(php_stream *stream, int c TSRMLS_DC) |