Revert "Merge branch 'PHP-5.6'"

This reverts commit aaf5689f4d6e523fd78e0291dbbcd78f3ea988dc, reversing
changes made to 481bf25b6ad70fcdc9c10f02b49c86a0bd4a3d0d.

diff --git a/Zend/zend.c b/Zend/zend.c
index bf820c2117af1b6831613e02d74d3091f3931691..a918bb0b9e501e40f3bb910b1d728453b9373917 100644 (file)
--- 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 8888b6ea1ff1aed02decb7b98871cb5f0ae90729..71a622f4173ecb2d1be851e563b02f14f68e0bf7 100644 (file)
--- 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 7842ecfb9189fdd286b36c5df347ccf6d57a621b..5984e2dc829b69ab72309545f3460d8735d2ecd9 100644 (file)
--- 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;