From: Anatol Belski <ab@php.net>
Date: Sun, 4 Jun 2017 20:15:29 +0000 (+0200)
Subject: fix ticks init in ts build
X-Git-Tag: php-7.2.0alpha2~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb6e718764fa33f0f4461c485cd12b89613db9c6;p=php

fix ticks init in ts build
---

diff --git a/main/main.c b/main/main.c
index 723fd7d49b..d6dee64e67 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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