diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-12-24 13:45:02 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-12-24 13:45:02 +0300 |
| commit | 5888fbde0d9687eda92f2bc8deb1e8c4ac171346 (patch) | |
| tree | 2dd20b029f07f8da6a1b6a7b8014d76073809111 | |
| parent | 7e597f48e9fda982e930e4f617d2b2d98d8878a5 (diff) | |
| download | php-git-5888fbde0d9687eda92f2bc8deb1e8c4ac171346.tar.gz | |
Backport later interned strings destruction.
| -rw-r--r-- | Zend/zend.c | 4 | ||||
| -rw-r--r-- | main/main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 76f1b69447..23cf94fcb2 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -930,10 +930,6 @@ void zend_shutdown(void) /* {{{ */ GLOBAL_CONSTANTS_TABLE = NULL; #endif zend_destroy_rsrc_list_dtors(); - -#ifndef ZTS - zend_interned_strings_dtor(); -#endif } /* }}} */ diff --git a/main/main.c b/main/main.c index ee92bcc7b4..a7452e9f04 100644 --- a/main/main.c +++ b/main/main.c @@ -2474,6 +2474,10 @@ void php_module_shutdown(void) php_output_shutdown(); +#ifndef ZTS + zend_interned_strings_dtor(); +#endif + module_initialized = 0; #ifndef ZTS |