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

Merge branch 'PHP-7.0' into PHP-7.1

Browse source 
* PHP-7.0:
  move id initialization into ctor
This commit is contained in:
Anatol Belski 2017-01-30 11:41:59 +01:00
commit f2c99e201e
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/opcache/ZendAccelerator.c
View file

@ -2094,11 +2094,6 @@ static void accel_activate(void)
ZCG(cwd_key_len) = 0;
ZCG(cwd_check) = 1;
#ifdef ZTS
/* TODO refactor to init this just once. */
accel_gen_system_id();
#endif
#ifdef HAVE_OPCACHE_FILE_CACHE
if (ZCG(accel_directives).file_cache_only) {
return;
@ -2564,6 +2559,9 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset(accel_globals, 0, sizeof(zend_accel_globals));
/* TODO refactor to init this just once. */
accel_gen_system_id();
}
static void accel_globals_internal_func_dtor(zval *zv)