From eb629b70da620fcdac6aca472c1450824ded15de Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 16 Dec 2014 09:12:09 +0100 Subject: 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. --- Zend/zend_ini.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Zend/zend_ini.c') diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 1ea6352415..d980d5222c 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -114,10 +114,10 @@ ZEND_API int zend_ini_startup(void) /* {{{ */ } /* }}} */ -ZEND_API int zend_ini_shutdown(void) /* {{{ */ +ZEND_API int zend_ini_shutdown(HashTable *ini_directives) /* {{{ */ { - zend_hash_destroy(EG(ini_directives)); - free(EG(ini_directives)); + zend_hash_destroy(ini_directives); + free(ini_directives); return SUCCESS; } /* }}} */ -- cgit v1.2.1