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 /ext/opcache/shared_alloc_win32.c | |
| 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
Diffstat (limited to 'ext/opcache/shared_alloc_win32.c')
| -rw-r--r-- | ext/opcache/shared_alloc_win32.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |