diff options
| author | Anatol Belski <ab@php.net> | 2015-12-07 22:55:24 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-12-07 22:55:24 +0100 |
| commit | 4aec8bcfa9502079e06fb77dc61f14f0d9005307 (patch) | |
| tree | 4eb23536f4bd45152ba9d9ecd3169546cc6bb90b | |
| parent | fd46184ab03509aa73c8194f7246c095ffbe45ae (diff) | |
| parent | 920c088082ec41d23a2ec90c3bd63be1037e5d60 (diff) | |
| download | php-git-4aec8bcfa9502079e06fb77dc61f14f0d9005307.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Fixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same server
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 5 | ||||
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 2 | ||||
| -rw-r--r-- | ext/opcache/shared_alloc_win32.c | 8 |
3 files changed, 4 insertions, 11 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 9129bac0f1..dc8cdb982f 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2459,8 +2459,6 @@ static void accel_globals_dtor(zend_accel_globals *accel_globals) } } -#ifdef HAVE_OPCACHE_FILE_CACHE - #define ZEND_BIN_ID "BIN_" ZEND_TOSTR(SIZEOF_CHAR) ZEND_TOSTR(SIZEOF_INT) ZEND_TOSTR(SIZEOF_LONG) ZEND_TOSTR(SIZEOF_SIZE_T) ZEND_TOSTR(SIZEOF_ZEND_LONG) ZEND_TOSTR(ZEND_MM_ALIGNMENT) static void accel_gen_system_id(void) @@ -2489,7 +2487,6 @@ static void accel_gen_system_id(void) md5str[(i * 2) + 1] = c; } } -#endif #ifdef HAVE_HUGE_CODE_PAGES # ifndef _WIN32 @@ -2619,9 +2616,7 @@ static int accel_startup(zend_extension *extension) return FAILURE; } -#ifdef HAVE_OPCACHE_FILE_CACHE accel_gen_system_id(); -#endif #ifdef HAVE_HUGE_CODE_PAGES if (ZCG(accel_directives).huge_code_pages && diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index c709503666..9256212090 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -228,9 +228,7 @@ typedef struct _zend_accel_globals { int auto_globals_mask; time_t request_time; time_t last_restart_time; /* used to synchronize SHM and in-process caches */ -#ifdef HAVE_OPCACHE_FILE_CACHE char system_id[32]; -#endif HashTable xlat_table; /* preallocated shared-memory block to save current script */ void *mem; diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c index ce4bacf348..9465a6d331 100644 --- a/ext/opcache/shared_alloc_win32.c +++ b/ext/opcache/shared_alloc_win32.c @@ -76,18 +76,18 @@ static void zend_win_error_message(int type, char *msg, int err) static char *create_name_with_username(char *name) { - static char newname[MAXPATHLEN + UNLEN + 4]; + static char newname[MAXPATHLEN + UNLEN + 4 + 1 + 32]; char uname[UNLEN + 1]; DWORD unsize = UNLEN; GetUserName(uname, &unsize); - snprintf(newname, sizeof(newname) - 1, "%s@%s", name, uname); + snprintf(newname, sizeof(newname) - 1, "%s@%s@%.32s", name, uname, ZCG(system_id)); return newname; } static char *get_mmap_base_file(void) { - static char windir[MAXPATHLEN+UNLEN + 3 + sizeof("\\\\@")]; + static char windir[MAXPATHLEN+UNLEN + 3 + sizeof("\\\\@") + 1 + 32]; char uname[UNLEN + 1]; DWORD unsize = UNLEN; int l; @@ -95,7 +95,7 @@ static char *get_mmap_base_file(void) GetTempPath(MAXPATHLEN, windir); GetUserName(uname, &unsize); l = strlen(windir); - snprintf(windir + l, sizeof(windir) - l - 1, "\\%s@%s", ACCEL_FILEMAP_BASE, uname); + snprintf(windir + l, sizeof(windir) - l - 1, "\\%s@%s@%.32s", ACCEL_FILEMAP_BASE, uname, ZCG(system_id)); return windir; } |