diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-11-10 13:10:16 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-11-10 13:10:16 +0000 |
| commit | f22ae56bc958eda4c5d15801bb66d8d5fd57a2b2 (patch) | |
| tree | 422d905e293fd6e6c696510c213d1935d11467ed /main/streams/plain_wrapper.c | |
| parent | f05ed6390cb5cec8df76621d29d8255b0ad21f6e (diff) | |
| download | php-git-f22ae56bc958eda4c5d15801bb66d8d5fd57a2b2.tar.gz | |
Disabled reading from stream (calls to read()) after EOF
Diffstat (limited to 'main/streams/plain_wrapper.c')
| -rw-r--r-- | main/streams/plain_wrapper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index f2f016709b..ab8efc6448 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -312,6 +312,9 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count TSRMLS assert(data != NULL); if (data->fd >= 0) { + if (stream->eof && !data->is_pipe) { + return 0; + } ret = read(data->fd, buf, count); stream->eof = (ret == 0 || (ret == (size_t)-1 && errno != EWOULDBLOCK)); |