From 4b1afc829c0d2a3fec999dbe7c32377b5ee91803 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 30 Jan 2017 11:40:23 +0100 Subject: [PATCH] move id initialization into ctor --- ext/opcache/ZendAccelerator.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 3baeebaece5..0db9202ee95 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2080,11 +2080,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; @@ -2548,6 +2543,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)