diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-21 13:57:05 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-21 16:07:57 +0200 |
commit | 19c844594e40d79cea016b54f9ab3a367440b4c9 (patch) | |
tree | dee764e2934dae24b4f0389b64585aaa49442901 /main/streams/php_stream_mmap.h | |
parent | d1feeed7f33bda43f92dd2b5fba9547b4cc3fe33 (diff) | |
download | php-git-19c844594e40d79cea016b54f9ab3a367440b4c9.tar.gz |
Fix mmap copying
Instead of attempting to map large files into memory at once, we map
chunks of at most `PHP_STREAM_MMAP_MAX` bytes, and repeat that until we
hit the point where `php_stream_seek()` fails (see bug 54902), and copy
the rest of the file by reading and writing small chunks.
We also fix the mapping behavior for zero bytes on Windows, which did
not error (as with `mmap()`), but would have mapped the remaining file.
Diffstat (limited to 'main/streams/php_stream_mmap.h')
-rw-r--r-- | main/streams/php_stream_mmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/streams/php_stream_mmap.h b/main/streams/php_stream_mmap.h index 132f3214c1..40288cc27f 100644 --- a/main/streams/php_stream_mmap.h +++ b/main/streams/php_stream_mmap.h @@ -58,6 +58,8 @@ typedef struct { #define PHP_STREAM_MMAP_ALL 0 +#define PHP_STREAM_MMAP_MAX (512 * 1024 * 1024) + #define php_stream_mmap_supported(stream) (_php_stream_set_option((stream), PHP_STREAM_OPTION_MMAP_API, PHP_STREAM_MMAP_SUPPORTED, NULL) == 0 ? 1 : 0) /* Returns 1 if the stream in its current state can be memory mapped, |