com php-src: Fixed HASH_FLAG_APPLY_PROTECTION flag us age: ext/opcache/zend_accelerator_util_funcs.c

Commit: 56731f68a79ab0402c1fd76270920875ec22f9a7 Author: Dmitry Stogov <dmitry@zend.com> Tue, 17 Jun 2014 13:53:23 +0400 Parents: accaaf9d6e15e57a64a054d7b5ebc0998ee510a4 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56731f68a79ab0402c1fd76270920875ec22f9a7 Log: Fixed HASH_FLAG_APPLY_PROTECTION flag usage 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 92350b7..486ebf5 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -448,7 +448,7 @@ static void zend_hash_clone_methods(HashTable *ht, HashTable *source, zend_class ht->nNumOfElements = source->nNumOfElements; ht->nNextFreeElement = source->nNextFreeElement; ht->pDestructor = ZEND_FUNCTION_DTOR; - ht->u.flags = HASH_FLAG_APPLY_PROTECTION; + ht->u.flags = 0; ht->nInternalPointer = source->nNumOfElements ? 0 : INVALID_IDX; #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO @@ -527,7 +527,7 @@ static void zend_hash_clone_prop_info(HashTable *ht, HashTable *source, zend_cla ht->nNumOfElements = source->nNumOfElements; ht->nNextFreeElement = source->nNextFreeElement; ht->pDestructor = zend_destroy_property_info; - ht->u.flags = HASH_FLAG_APPLY_PROTECTION; + ht->u.flags = 0; ht->nInternalPointer = source->nNumOfElements ? 0 : INVALID_IDX; #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO @@ -667,6 +667,7 @@ static void zend_class_copy_ctor(zend_class_entry **pce) /* constants table */ zend_hash_clone_zval(&ce->constants_table, &old_ce->constants_table, 1); + ce->constants_table.u.flags &= ~HASH_FLAG_APPLY_PROTECTION; ce->name = zend_clone_str(ce->name TSRMLS_CC);