archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken)

Browse source
This commit is contained in:
Dmitry Stogov 2015-09-24 10:48:34 +03:00
parent 92708e3e04
commit 262160e0e9
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -24,6 +24,9 @@ PHP NEWS
. Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer . Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer
reqeusts). (Laruence) reqeusts). (Laruence)
- Opcache
. Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken)
- OpenSSL - OpenSSL
. Require at least OpenSSL version 0.9.8. (Jakub Zelenka) . Require at least OpenSSL version 0.9.8. (Jakub Zelenka)
. Fixed bug #68312 (Lookup for openssl.cnf causes a message box). (Anatol) . Fixed bug #68312 (Lookup for openssl.cnf causes a message box). (Anatol)

7
ext/opcache/shared_alloc_win32.c
View file

@ -206,12 +206,17 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
/* Mapping failed, wait for mapping object to get freed and retry */ /* Mapping failed, wait for mapping object to get freed and retry */
CloseHandle(memfile); CloseHandle(memfile);
memfile = NULL; memfile = NULL;
if (++map_retries < MAX_MAP_RETRIES) {
break;
}
zend_shared_alloc_unlock_win32();
Sleep(1000 * (map_retries + 1)); Sleep(1000 * (map_retries + 1));
zend_shared_alloc_lock_win32();
} else { } else {
zend_shared_alloc_unlock_win32(); zend_shared_alloc_unlock_win32();
return ret; return ret;
} }
} while (++map_retries < MAX_MAP_RETRIES); } while (1);
if (map_retries == MAX_MAP_RETRIES) { if (map_retries == MAX_MAP_RETRIES) {
zend_shared_alloc_unlock_win32(); zend_shared_alloc_unlock_win32();