summaryrefslogtreecommitdiff
path: root/main/streams
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-10-31 09:37:27 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-10-31 09:37:27 +0100
commit0b689c163ed8b8de56c8f96060dd80c35d4c4496 (patch)
treed232c540b389008ec201f1b02bfe5d14f4d879de /main/streams
parent7816df2c579a80446ef65d4c29fa122a220d4a09 (diff)
parent333d607d47ca6eec96637c1c8686591dec6f5a0b (diff)
downloadphp-git-0b689c163ed8b8de56c8f96060dd80c35d4c4496.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix bug #77930: Remove mmap limit
Diffstat (limited to 'main/streams')
-rw-r--r--main/streams/mmap.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/main/streams/mmap.c b/main/streams/mmap.c
index 445ee64951..c99c63f065 100644
--- a/main/streams/mmap.c
+++ b/main/streams/mmap.c
@@ -27,12 +27,6 @@ PHPAPI char *_php_stream_mmap_range(php_stream *stream, size_t offset, size_t le
range.mode = mode;
range.mapped = NULL;
- /* For now, we impose an arbitrary limit to avoid
- * runaway swapping when large files are passed through. */
- if (length > 4 * 1024 * 1024) {
- return NULL;
- }
-
if (PHP_STREAM_OPTION_RETURN_OK == php_stream_set_option(stream, PHP_STREAM_OPTION_MMAP_API, PHP_STREAM_MMAP_MAP_RANGE, &range)) {
if (mapped_len) {
*mapped_len = range.length;