diff options
| author | Michael Wallner <mike@php.net> | 2014-04-03 10:41:53 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-04-03 10:41:53 +0200 |
| commit | 8d4ee1dbedcd339f119f04058e72eebba272bdb5 (patch) | |
| tree | 6d27410f1f660d84f34ceb0341320522cfd8d5de /main/streams/streams.c | |
| parent | 3f8c45e28c158102b8d94578d57d9d634c878db4 (diff) | |
| parent | b628c36a85316486f85c8cc499528f987b63fa05 (diff) | |
| download | php-git-8d4ee1dbedcd339f119f04058e72eebba272bdb5.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fix Bug #66736 fpassthru broken
Diffstat (limited to 'main/streams/streams.c')
| -rw-r--r-- | main/streams/streams.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index f8295017c1..c7ff1210a8 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1400,11 +1400,16 @@ PHPAPI size_t _php_stream_passthru(php_stream * stream STREAMS_DC TSRMLS_DC) p = php_stream_mmap_range(stream, php_stream_tell(stream), PHP_STREAM_MMAP_ALL, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped); if (p) { - PHPWRITE(p, mapped); + do { + /* output functions return int, so pass in int max */ + if (0 < (b = PHPWRITE(p, MIN(mapped - bcount, INT_MAX)))) { + bcount += b; + } + } while (b > 0 && mapped > bcount); php_stream_mmap_unmap_ex(stream, mapped); - return mapped; + return bcount; } } |