diff options
| author | Anatol Belski <ab@php.net> | 2014-12-16 09:12:09 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-16 09:12:09 +0100 |
| commit | eb629b70da620fcdac6aca472c1450824ded15de (patch) | |
| tree | 5955554e74fff9d4ed08d418907cba650b225283 /Zend/zend.c | |
| parent | 50a93357fb748ee1976fb7993abccae9c8105157 (diff) | |
| download | php-git-eb629b70da620fcdac6aca472c1450824ded15de.tar.gz | |
free the right globals
That's the same as in the previous commit. In the TS mode the tsrm
cache pointer might be unavailable or point to a wrong thread, so
the exact globals passed should be freed.
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index af323d46f7..50c90ede25 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -487,7 +487,7 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{ static void executor_globals_dtor(zend_executor_globals *executor_globals) /* {{{ */ { - zend_ini_shutdown(); + zend_ini_shutdown(executor_globals->ini_directives); if (&executor_globals->persistent_list != global_persistent_list) { zend_destroy_rsrc_list(&executor_globals->persistent_list); } |