]> granicus.if.org Git - php/commitdiff
fix ticks init in ts build
authorAnatol Belski <ab@php.net>
Sun, 4 Jun 2017 20:15:29 +0000 (22:15 +0200)
committerAnatol Belski <ab@php.net>
Thu, 15 Jun 2017 21:48:03 +0000 (23:48 +0200)
main/main.c

index 723fd7d49b64e390859e860f47bad9424cb2946b..d6dee64e6717e856b09234944bd60b528a2c6ba2 100644 (file)
@@ -1948,6 +1948,7 @@ static size_t php_output_wrapper(const char *str, size_t str_length)
 static void core_globals_ctor(php_core_globals *core_globals)
 {
        memset(core_globals, 0, sizeof(*core_globals));
+       php_startup_ticks();
 }
 /* }}} */
 #endif
@@ -2106,7 +2107,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 
 #ifdef ZTS
        ts_allocate_id(&core_globals_id, sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, (ts_allocate_dtor) core_globals_dtor);
-       php_startup_ticks();
 #ifdef PHP_WIN32
        ts_allocate_id(&php_win32_core_globals_id, sizeof(php_win32_core_globals), (ts_allocate_ctor) php_win32_core_globals_ctor, (ts_allocate_dtor) php_win32_core_globals_dtor);
 #endif