com php-src: Store constant flags: ext/opcache/zend_accelerat or_util_funcs.c

From: Date: Tue, 01 Apr 2014 12:30:13 +0000
Subject: com php-src: Store constant flags: ext/opcache/zend_accelerat or_util_funcs.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77500@lists.php.net to get a copy of this message
Commit: 7eff369ba94f244604669f4b0e9737dc06265f43 Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 16:30:13 +0400 Parents: 9799542ffa799a678d3903f89b434101e8478854 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7eff369ba94f244604669f4b0e9737dc06265f43 Log: Store constant flags Changed paths: M ext/opcache/zend_accelerator_util_funcs.c Diff: diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index 1ea652b..89b3b11 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -403,6 +403,7 @@ static void zend_hash_clone_zval(HashTable *ht, HashTable *source, int bind) q->key = NULL; } else { q->key = STR_DUP(p->key, 0); + q->key->gc.u.v.flags = p->key->gc.u.v.flags; } /* Copy data */ @@ -646,7 +647,7 @@ static void zend_class_copy_ctor(zend_class_entry **pce) ce->default_properties_table = emalloc(sizeof(zval) * old_ce->default_properties_count); for (i = 0; i < old_ce->default_properties_count; i++) { ZVAL_COPY_VALUE(&ce->default_properties_table[i], &old_ce->default_properties_table[i]); - zend_clone_zval(&ce->default_properties_table[i], 0 TSRMLS_CC); + zend_clone_zval(&ce->default_properties_table[i], 1 TSRMLS_CC); } } #else

« previous php.cvs (#77500) next »