diff options
| author | Anatol Belski <ab@php.net> | 2017-01-30 11:41:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-01-30 11:41:59 +0100 |
| commit | f2c99e201ed52da4b395d833bb6f5edbab3b2dba (patch) | |
| tree | 574d3d2c744968af8abfebdbddffe8dec45d8782 | |
| parent | 2a5a3104462ad9d46be9d74fa85be26793870ce6 (diff) | |
| parent | 4b1afc829c0d2a3fec999dbe7c32377b5ee91803 (diff) | |
| download | php-git-f2c99e201ed52da4b395d833bb6f5edbab3b2dba.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move id initialization into ctor
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index d3107c09b4..d316fd83f4 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -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) |