Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Reset globals on startup or restart
php · Jul 19, 2017 · 4252f14 · 4252f14
2 parents 8e7c99a + e5beb4e
commit 4252f14
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/main/main.c b/main/main.c
@@ -2107,6 +2107,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	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
 #else
+	memset(&core_globals, 0, sizeof(core_globals));
 	php_startup_ticks();
 #endif
 	gc_globals_ctor();