summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-09-15 10:40:46 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-09-15 10:41:19 +0200
commitec3f3002cd1594aab88e998f56e385fd6b1b4ff8 (patch)
treeaccccbd470fd5f4f3dbf0e293ca1dbb9abba0579 /main
parente413b4c7ba37a05a76e3de27b584157afabdaf39 (diff)
downloadphp-git-ec3f3002cd1594aab88e998f56e385fd6b1b4ff8.tar.gz
Fix observer leak
Make sure to startup observer infrastructure before we register the first observer...
Diffstat (limited to 'main')
-rw-r--r--main/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c
index 5970cb4e18..103c10a06b 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2044,6 +2044,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
zend_startup(&zuf);
zend_update_current_locale();
+ zend_observer_startup();
#if ZEND_DEBUG
zend_observer_error_register(report_zend_debug_error_notify_cb);
#endif
@@ -2192,7 +2193,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
php_startup_auto_globals();
zend_set_utility_values(&zuv);
php_startup_sapi_content_types();
- zend_observer_startup();
/* startup extensions statically compiled in */
if (php_register_internal_extensions_func() == FAILURE) {