com php-src: reworked ini dtor: Zend/zend.c Zend/zend_ini.c Zend/zend_ini.h
| From: | Anatol Belski | Date: | Tue, 16 Dec 2014 09:15:02 +0000 |
| Subject: | com php-src: reworked ini dtor: Zend/zend.c Zend/zend_ini.c Zend/zend_ini.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83735@lists.php.net to get a copy of this message | ||
Commit: 9e4310eeebf40e8fe3ab2f85203ea8cb1545b685
Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 10:15:02 +0100
Parents: eb629b70da620fcdac6aca472c1450824ded15de
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e4310eeebf40e8fe3ab2f85203ea8cb1545b685
Log:
reworked ini dtor
Changed paths:
M Zend/zend.c
M Zend/zend_ini.c
M Zend/zend_ini.h
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index 50c90ed..03dfbc4 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);
}
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index d980d52..fe1f950 100644
--- 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 81a2ee3..5030819 100644
--- 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);