]> granicus.if.org Git - php/commitdiff
Fix observer leak
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 15 Sep 2020 08:40:46 +0000 (10:40 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 15 Sep 2020 08:41:19 +0000 (10:41 +0200)
Make sure to startup observer infrastructure before we register
the first observer...

main/main.c

index 5970cb4e185d5702b0d05376106af016b2b4daf8..103c10a06b2415a83ccc5a46b5a4307ea4527bfc 100644 (file)
@@ -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) {