From ec3f3002cd1594aab88e998f56e385fd6b1b4ff8 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 15 Sep 2020 10:40:46 +0200 Subject: [PATCH] Fix observer leak Make sure to startup observer infrastructure before we register the first observer... --- main/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- 2.50.1