reworked ini dtor

diff --git a/Zend/zend.c b/Zend/zend.c
index 50c90ede25d984d408ea0288757a17fd49e06672..03dfbc4402d980f225e0e77c45859f6bf08ce89f 100644 (file)
--- 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);
        }

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index d980d5222ce36781319b8d4bb2dfa82998ad1d2b..fe1f950184e546210fbe7dc27ca71ef911fc87f3 100644 (file)
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -114,11 +114,17 @@ ZEND_API int zend_ini_startup(void) /* {{{ */
 }
 /* }}} */
 
-ZEND_API int zend_ini_shutdown(HashTable *ini_directives) /* {{{ */
+ZEND_API int zend_ini_shutdown(void) /* {{{ */
+{
+       zend_ini_dtor(EG(ini_directives));
+       return SUCCESS;
+}
+/* }}} */
+
+ZEND_API void zend_ini_dtor(HashTable *ini_directives) /* {{{ */
 {
        zend_hash_destroy(ini_directives);
        free(ini_directives);
-       return SUCCESS;
 }
 /* }}} */
 

diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
index 81a2ee3ef3f64f434ee6e92619a4aea43f6d461e..5030819d6bdcef4f69e784cdb12358cda163a727 100644 (file)
--- a/Zend/zend_ini.h
+++ b/Zend/zend_ini.h
@@ -62,9 +62,10 @@ struct _zend_ini_entry {
 
 BEGIN_EXTERN_C()
 ZEND_API int zend_ini_startup(void);
-ZEND_API int zend_ini_shutdown(HashTable *ini_directives);
+ZEND_API int zend_ini_shutdown(void);
 ZEND_API int zend_ini_global_shutdown(void);
 ZEND_API int zend_ini_deactivate(void);
+ZEND_API void zend_ini_dtor(HashTable *ini_directives);
 
 ZEND_API int zend_copy_ini_directives(void);