summaryrefslogtreecommitdiff
path: root/Zend/zend_ini.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-16 09:12:09 +0100
committerAnatol Belski <ab@php.net>2014-12-16 09:12:09 +0100
commiteb629b70da620fcdac6aca472c1450824ded15de (patch)
tree5955554e74fff9d4ed08d418907cba650b225283 /Zend/zend_ini.c
parent50a93357fb748ee1976fb7993abccae9c8105157 (diff)
downloadphp-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_ini.c')
-rw-r--r--Zend/zend_ini.c6
1 files changed, 3 insertions, 3 deletions
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;
}
/* }}} */