com php-src: Revert "Merge branch 'PHP-5.6'": Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c

From: Date: Mon, 01 Sep 2014 21:35:04 +0000
Subject: com php-src: Revert "Merge branch 'PHP-5.6'": Zend/zend.c Zend/zend_compile.h Zend/zend_execute_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81350@lists.php.net to get a copy of this message
Commit: 1ff1a0dde2427e78738c93a3ac3e9b111824ee27 Author: Stanislav Malyshev <stas@php.net> Mon, 1 Sep 2014 14:35:04 -0700 Parents: aaf5689f4d6e523fd78e0291dbbcd78f3ea988dc Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ff1a0dde2427e78738c93a3ac3e9b111824ee27 Log: Revert "Merge branch 'PHP-5.6'" This reverts commit aaf5689f4d6e523fd78e0291dbbcd78f3ea988dc, reversing changes made to 481bf25b6ad70fcdc9c10f02b49c86a0bd4a3d0d. Changed paths: M Zend/zend.c M Zend/zend_compile.h M Zend/zend_execute_API..c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index bf820c2..a918bb0 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 8888b6e..71a622f 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 7842ecf..5984e2d 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;

« previous php.cvs (#81350) next »