summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-06-04 22:15:29 +0200
committerAnatol Belski <ab@php.net>2017-06-15 23:48:03 +0200
commitfb6e718764fa33f0f4461c485cd12b89613db9c6 (patch)
tree3f986d203e636e59db945c5a7511a6d9958c4fcc
parentf5c3d21c4e1a1993cbbcdde9383475631f33ab18 (diff)
downloadphp-git-fb6e718764fa33f0f4461c485cd12b89613db9c6.tar.gz
fix ticks init in ts build
-rw-r--r--main/main.c2
1 files changed, 1 insertions, 1 deletions
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