From 1ff1a0dde2427e78738c93a3ac3e9b111824ee27 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 1 Sep 2014 14:35:04 -0700 Subject: [PATCH] Revert "Merge branch 'PHP-5.6'" This reverts commit aaf5689f4d6e523fd78e0291dbbcd78f3ea988dc, reversing changes made to 481bf25b6ad70fcdc9c10f02b49c86a0bd4a3d0d. --- Zend/zend.c | 14 -------------- Zend/zend_compile.h | 4 ---- Zend/zend_execute_API.c | 4 ++-- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index bf820c2117..a918bb0b9e 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -812,20 +812,6 @@ void zend_shutdown(TSRMLS_D) /* {{{ */ zend_shutdown_timeout_thread(); #endif zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); - - if (EG(active)) - { - /* - * The order of destruction is important here. - * See bugs #65463 and 66036. - */ - zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) zend_cleanup_function_data_full TSRMLS_CC); - zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) zend_cleanup_user_class_data TSRMLS_CC); - zend_cleanup_internal_classes(TSRMLS_C); - zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) clean_non_persistent_function_full TSRMLS_CC); - zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) clean_non_persistent_class_full TSRMLS_CC); - } - zend_destroy_modules(); virtual_cwd_deactivate(TSRMLS_C); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 8888b6ea1f..71a622f417 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -491,10 +491,6 @@ ZEND_API void zend_cleanup_user_class_data(zend_class_entry *ce TSRMLS_DC); ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce TSRMLS_DC); ZEND_API void zend_cleanup_internal_classes(TSRMLS_D); ZEND_API void zend_cleanup_op_array_data(zend_op_array *op_array); -ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC); -ZEND_API int zend_cleanup_function_data_full(zend_function *function TSRMLS_DC); -ZEND_API int clean_non_persistent_function_full(zend_function *function TSRMLS_DC); -ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC); ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC); ZEND_API void zend_function_dtor(zval *zv); diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 7842ecfb91..5984e2dc82 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -110,7 +110,7 @@ static int clean_non_persistent_function(zval *zv TSRMLS_DC) /* {{{ */ } /* }}} */ -ZEND_API int clean_non_persistent_function_full(zval *zv TSRMLS_DC) /* {{{ */ +static int clean_non_persistent_function_full(zval *zv TSRMLS_DC) /* {{{ */ { zend_function *function = Z_PTR_P(zv); return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE; @@ -124,7 +124,7 @@ static int clean_non_persistent_class(zval *zv TSRMLS_DC) /* {{{ */ } /* }}} */ -ZEND_API int clean_non_persistent_class_full(zval *zv TSRMLS_DC) /* {{{ */ +static int clean_non_persistent_class_full(zval *zv TSRMLS_DC) /* {{{ */ { zend_class_entry *ce = Z_PTR_P(zv); return (ce->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE; -- 2.50.1