diff options
| author | Anatol Belski <ab@php.net> | 2014-12-16 10:15:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-16 10:15:02 +0100 |
| commit | 9e4310eeebf40e8fe3ab2f85203ea8cb1545b685 (patch) | |
| tree | e9d4617efc346bd767e8d253d7ed9878879223a1 /Zend/zend.c | |
| parent | eb629b70da620fcdac6aca472c1450824ded15de (diff) | |
| download | php-git-9e4310eeebf40e8fe3ab2f85203ea8cb1545b685.tar.gz | |
reworked ini dtor
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); } |