diff options
author | Dmitry Stogov <dmitry@zend.com> | 2017-06-22 01:45:28 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2017-06-22 01:45:28 +0300 |
commit | f25ecdacf805f840f743b67b6d84485b2deceb4f (patch) | |
tree | f8f6c7606287b952dcdf51e2ee9f528606bb9a2c /Zend/zend.c | |
parent | 9fb0e6ffe29cc37b6b84a093d7438f0453cc1c41 (diff) | |
download | php-git-f25ecdacf805f840f743b67b6d84485b2deceb4f.tar.gz |
shutdown_executor() refactoring (reuse opcache fast request shutdown code)
Diffstat (limited to 'Zend/zend.c')
-rw-r--r-- | Zend/zend.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index d51bd277a6..a5434c2e5e 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -903,31 +903,6 @@ void zend_post_startup(void) /* {{{ */ void zend_shutdown(void) /* {{{ */ { zend_destroy_rsrc_list(&EG(persistent_list)); - if (EG(active)) - { - /* - * The order of destruction is important here. - * See bugs #65463 and 66036. - */ - zend_function *func; - zend_class_entry *ce; - - ZEND_HASH_REVERSE_FOREACH_PTR(GLOBAL_FUNCTION_TABLE, func) { - if (func->type == ZEND_USER_FUNCTION) { - zend_cleanup_op_array_data((zend_op_array *) func); - } - } ZEND_HASH_FOREACH_END(); - ZEND_HASH_REVERSE_FOREACH_PTR(GLOBAL_CLASS_TABLE, ce) { - if (ce->type == ZEND_USER_CLASS) { - zend_cleanup_user_class_data(ce); - } else { - break; - } - } ZEND_HASH_FOREACH_END(); - zend_cleanup_internal_classes(); - zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) clean_non_persistent_function_full); - zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) clean_non_persistent_class_full); - } zend_destroy_modules(); virtual_cwd_deactivate(); |