diff options
| author | Arnaud Le Blanc <lbarnaud@php.net> | 2009-05-17 14:57:05 +0000 |
|---|---|---|
| committer | Arnaud Le Blanc <lbarnaud@php.net> | 2009-05-17 14:57:05 +0000 |
| commit | 0e4de79b40219e3ababd5aa723ed071a75ed2503 (patch) | |
| tree | 62602fb3da935d0bed2b2f1ab9d72b1364dec898 /main/streams/streams.c | |
| parent | 7c976e15d68795decc2e4e0eabb2a6e9d14c13f7 (diff) | |
| download | php-git-0e4de79b40219e3ababd5aa723ed071a75ed2503.tar.gz | |
Fixed bug #48309 (stream_copy_to_stream() and fpasstru() do not
update stream position of plain files)
Diffstat (limited to 'main/streams/streams.c')
| -rwxr-xr-x | main/streams/streams.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index e953a1690f..caab99f92f 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1603,12 +1603,12 @@ PHPAPI size_t _php_stream_passthru(php_stream * stream STREAMS_DC TSRMLS_DC) char *p; size_t mapped; - p = php_stream_mmap_range(stream, php_stream_tell(stream), PHP_STREAM_COPY_ALL, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped); + 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); - php_stream_mmap_unmap(stream); + php_stream_mmap_unmap_ex(stream, mapped); return mapped; } @@ -1916,7 +1916,7 @@ PHPAPI size_t _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, s if (p) { mapped = php_stream_write(dest, p, mapped); - php_stream_mmap_unmap(src); + php_stream_mmap_unmap_ex(src, mapped); *len = mapped; |