php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 06:02:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  Avoid multiple allocations of the same key in different processes
This commit is contained in:
Dmitry Stogov
2013-06-10 11:44:54 +04:00
parent 456ef2ebfa 23a9bb09ba
commit 95d88cc66a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/opcache/ZendAccelerator.c
View File

@@ -2587,7 +2587,9 @@ static int accel_startup(zend_extension *extension)
ZCG(include_path_key) = NULL;
if (ZCG(include_path) && *ZCG(include_path)) {
ZCG(include_path_len) = strlen(ZCG(include_path));
if (!zend_accel_hash_is_full(&ZCSG(include_paths))) {
ZCG(include_path_key) = zend_accel_hash_find(&ZCSG(include_paths), ZCG(include_path), ZCG(include_path_len) + 1);
if (!ZCG(include_path_key) &&
!zend_accel_hash_is_full(&ZCSG(include_paths))) {
char *key;
zend_shared_alloc_lock(TSRMLS_C);