diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-07-19 15:36:48 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-07-19 15:36:48 +0300 |
| commit | 95a1f77b5ea8c6fd9b2ece08df73d546bac52acf (patch) | |
| tree | 81291e240f13a1981dc2212c1e5d00f502caa538 | |
| parent | 8447b86eef4ee7fe67757672972e9409fc6e14f3 (diff) | |
| parent | 4252f14299a9e1939d862b3ef83a3af83c8dd098 (diff) | |
| download | php-git-95a1f77b5ea8c6fd9b2ece08df73d546bac52acf.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Reset globals on startup or restart
| -rw-r--r-- | main/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c index 4ef2b41639..25fa644e4d 100644 --- a/main/main.c +++ b/main/main.c @@ -2111,6 +2111,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(); |