summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-09-03 15:11:45 +0200
committerAnatol Belski <ab@php.net>2018-09-03 15:11:45 +0200
commite0b91051ae757f4a4eb71dcf17cbc3b108cfa60b (patch)
treeae9b6e3ba4b293c49aa69aa07a02b38b0312765e
parent887e126240acc71359429c79f485959d5c9a4a86 (diff)
parent1640d9182a3d8dbe14c1518a98fa49257d05e5a2 (diff)
downloadphp-git-e0b91051ae757f4a4eb71dcf17cbc3b108cfa60b.tar.gz
Merge branch 'PHP-7.3'
* PHP-7.3: Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
-rw-r--r--ext/opcache/shared_alloc_win32.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c
index 89b5df3eef..5207a59812 100644
--- a/ext/opcache/shared_alloc_win32.c
+++ b/ext/opcache/shared_alloc_win32.c
@@ -22,6 +22,7 @@
#include "ZendAccelerator.h"
#include "zend_shared_alloc.h"
#include "zend_accelerator_util_funcs.h"
+#include "tsrm_win32.h"
#include <winbase.h>
#include <process.h>
#include <LMCONS.H>
@@ -159,6 +160,12 @@ static int zend_shared_alloc_reattach(size_t requested_size, char **error_in)
return ALLOC_FAILURE;
}
fclose(fp);
+
+ if (0 > win32_utime(mmap_base_file, NULL)) {
+ err = GetLastError();
+ zend_win_error_message(ACCEL_LOG_WARNING, mmap_base_file, err);
+ }
+
/* Check if the requested address space is free */
if (VirtualQuery(wanted_mapping_base, &info, sizeof(info)) == 0 ||
info.State != MEM_FREE ||