archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

reworked ini dtor

Browse source
This commit is contained in:
Anatol Belski 2014-12-16 10:15:02 +01:00
parent eb629b70da
commit 9e4310eeeb
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend.c
View file

@ -487,7 +487,11 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{
static void executor_globals_dtor(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) { if (&executor_globals->persistent_list != global_persistent_list) {
zend_destroy_rsrc_list(&executor_globals->persistent_list); zend_destroy_rsrc_list(&executor_globals->persistent_list);
} }

10
Zend/zend_ini.c
View file

@ -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); zend_hash_destroy(ini_directives);
free(ini_directives); free(ini_directives);
return SUCCESS;
} }
/* }}} */ /* }}} */

3
Zend/zend_ini.h
View file

@ -62,9 +62,10 @@ struct _zend_ini_entry {
BEGIN_EXTERN_C() BEGIN_EXTERN_C()
ZEND_API int zend_ini_startup(void); 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_global_shutdown(void);
ZEND_API int zend_ini_deactivate(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); ZEND_API int zend_copy_ini_directives(void);