com php-src: Fixed cleanup on request shutdown: Zend/zend_exe cute_API.c

From: Date: Tue, 18 Mar 2014 10:52:54 +0000
Subject: com php-src: Fixed cleanup on request shutdown: Zend/zend_exe cute_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77548@lists.php.net to get a copy of this message
Commit: da9a2872b0170d74ea1fce95af710bdb1242644c Author: Dmitry Stogov <dmitry@zend.com> Tue, 18 Mar 2014 14:52:54 +0400 Parents: 89ad91a8cc3c9378d8b257ba2c7881265ed04f67 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da9a2872b0170d74ea1fce95af710bdb1242644c Log: Fixed cleanup on request shutdown Changed paths: M Zend/zend_execute_API.c Diff: diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 339a71b..73c00ea 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -103,27 +103,31 @@ static void zend_extension_deactivator(zend_extension *extension TSRMLS_DC) /* { } /* }}} */ -static int clean_non_persistent_function(zend_function *function TSRMLS_DC) /* {{{ */ +static int clean_non_persistent_function(zval *zv TSRMLS_DC) /* {{{ */ { + zend_function *function = Z_PTR_P(zv); return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_STOP : ZEND_HASH_APPLY_REMOVE; } /* }}} */ -static int clean_non_persistent_function_full(zend_function *function 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; } /* }}} */ -static int clean_non_persistent_class(zend_class_entry **ce TSRMLS_DC) /* {{{ */ +static int clean_non_persistent_class(zval *zv TSRMLS_DC) /* {{{ */ { - return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_STOP : ZEND_HASH_APPLY_REMOVE; + zend_class_entry *ce = Z_PTR_P(zv); + return (ce->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_STOP : ZEND_HASH_APPLY_REMOVE; } /* }}} */ -static int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC) /* {{{ */ +static int clean_non_persistent_class_full(zval *zv TSRMLS_DC) /* {{{ */ { - return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE; + 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 (#77548) next »