diff options
| author | Wez Furlong <wez@php.net> | 2003-02-13 01:17:45 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-02-13 01:17:45 +0000 |
| commit | b2b3596257eb2194fc6b91961602844da62bd5aa (patch) | |
| tree | e7a58fba82560887757604b7df378ad5af74bae9 /main | |
| parent | 44559a18f97c16ac7ebc23f5519cbf4bd2774ffe (diff) | |
| download | php-git-b2b3596257eb2194fc6b91961602844da62bd5aa.tar.gz | |
Fix for Bug #21815 (fpassthru ignored buffered data but then complained anyway)
Diffstat (limited to 'main')
| -rwxr-xr-x | main/streams.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/streams.c b/main/streams.c index 3d67b4a3f2..5413bc8f79 100755 --- a/main/streams.c +++ b/main/streams.c @@ -1029,6 +1029,7 @@ PHPAPI size_t _php_stream_passthru(php_stream * stream STREAMS_DC TSRMLS_DC) #ifdef HAVE_MMAP if (!php_stream_is(stream, PHP_STREAM_IS_SOCKET) && stream->filterhead == NULL + && php_stream_tell(stream) == 0 && SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)&fd, 0)) { struct stat sbuf; @@ -2047,7 +2048,7 @@ exit_success: * know that they should try something else */ php_error_docref(NULL TSRMLS_CC, E_WARNING, - "%d bytes of buffered data lost during conversion to FILE*!", + "%d bytes of buffered data lost during conversion!", stream->writepos - stream->readpos); } |