From 9e4310eeebf40e8fe3ab2f85203ea8cb1545b685 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 16 Dec 2014 10:15:02 +0100 Subject: reworked ini dtor --- Zend/zend.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Zend/zend.c') diff --git a/Zend/zend.c b/Zend/zend.c index 50c90ede25..03dfbc4402 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -487,7 +487,11 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{ static void executor_globals_dtor(zend_executor_globals *executor_globals) /* {{{ */ { - zend_ini_shutdown(executor_globals->ini_directives); +#ifdef ZTS + zend_ini_dtor(executor_globals->ini_directives); +#else + zend_ini_shutdown(); +#endif if (&executor_globals->persistent_list != global_persistent_list) { zend_destroy_rsrc_list(&executor_globals->persistent_list); } -- cgit v1.2.1