diff options
| author | Anatol Belski <ab@php.net> | 2017-06-20 15:45:05 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-06-20 15:45:05 +0200 |
| commit | 67f063e3ac82bd0efeefac7bb8f6ec3acae31ebf (patch) | |
| tree | d4c31361d8afb1b57706a69c41fab80cba0d63ea | |
| parent | 3f2cfac5d6935411a1948db7a34a441b9c48c18e (diff) | |
| parent | 6a854e274088341103835f99a4c437596cbf66c0 (diff) | |
| download | php-git-67f063e3ac82bd0efeefac7bb8f6ec3acae31ebf.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Split requested size as expected by CreateFileMapping.
| -rw-r--r-- | ext/opcache/shared_alloc_win32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c index 0c62d17525..13a4cf5e8c 100644 --- a/ext/opcache/shared_alloc_win32.c +++ b/ext/opcache/shared_alloc_win32.c @@ -221,8 +221,10 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_ */ #if defined(_WIN64) void *vista_mapping_base_set[] = { (void *) 0x0000100000000000, (void *) 0x0000200000000000, (void *) 0x0000300000000000, (void *) 0x0000700000000000, 0 }; + DWORD size_high = (requested_size >> 32), size_low = (requested_size & 0xffffffff); #else void *vista_mapping_base_set[] = { (void *) 0x20000000, (void *) 0x21000000, (void *) 0x30000000, (void *) 0x31000000, (void *) 0x50000000, 0 }; + DWORD size_high = 0, size_low = requested_size; #endif void **wanted_mapping_base = default_mapping_base_set; @@ -275,7 +277,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_ shared_segment = (zend_shared_segment *)((char *)(*shared_segments_p) + sizeof(void *)); (*shared_segments_p)[0] = shared_segment; - memfile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, requested_size, + memfile = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, size_high, size_low, create_name_with_username(ACCEL_FILEMAP_NAME)); if (memfile == NULL) { err = GetLastError(); |