]> granicus.if.org Git - php/commitdiff
Disabled reading from stream (calls to read()) after EOF
authorDmitry Stogov <dmitry@php.net>
Fri, 10 Nov 2006 13:10:28 +0000 (13:10 +0000)
committerDmitry Stogov <dmitry@php.net>
Fri, 10 Nov 2006 13:10:28 +0000 (13:10 +0000)
main/streams/plain_wrapper.c

index 7bf3cfc4268619f96180b5a0ba2f4929de1445de..853abdbb185ca136f2522ef88dd0447dcab3a155 100644 (file)
@@ -316,6 +316,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));