com php-src: Replace code with zend_clean_and_cache_sym bol_table() call: Zend/zend_execute_API.c
| From: | Nikita Popov | Date: | Sun, 16 Sep 2012 19:54:48 +0000 |
| Subject: | com php-src: Replace code with zend_clean_and_cache_sym bol_table() call: Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70179@lists.php.net to get a copy of this message | ||
Commit: 526db7db14f73c652a6b1a80149ede114ddd024c
Author: Nikita Popov <nikic@php.net> Sun, 16 Sep 2012 21:54:48 +0200
Parents: fb03ce93d3829b4e7378b2d3522da6fb2db12205
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=526db7db14f73c652a6b1a80149ede114ddd024c
Log:
Replace code with zend_clean_and_cache_symbol_table() call
I replaced other instances of this code with the function call, but missed
this one.
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index fb0c18b..ddf86e8 100644
--- a/Zend/zend_execute_API..c
+++ b/Zend/zend_execute_API.c
@@ -964,15 +964,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache
TS
}
if (!fci->symbol_table && EG(active_symbol_table)) {
- if (EG(symtable_cache_ptr)>=EG(symtable_cache_limit)) {
- zend_hash_destroy(EG(active_symbol_table));
- FREE_HASHTABLE(EG(active_symbol_table));
- } else {
- /* clean before putting into the cache, since clean
- could call dtors, which could use cached hash */
- zend_hash_clean(EG(active_symbol_table));
- *(++EG(symtable_cache_ptr)) = EG(active_symbol_table);
- }
+ zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC);
}
EG(active_symbol_table) = calling_symbol_table;
EG(active_op_array) = original_op_array;