com php-src: Exclude interned flags from constant flags: Zend/zend_execute_API.c

From: Date: Tue, 01 Apr 2014 10:20:10 +0000
Subject: com php-src: Exclude interned flags from constant flags: Zend/zend_execute_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77506@lists.php.net to get a copy of this message
Commit: 70b7950a75609c4386f996fe7cb1a005447262b4 Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 14:20:10 +0400 Parents: 9b196ca6e872369263c55e66ceca0183f75d6420 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=70b7950a75609c4386f996fe7cb1a005447262b4 Log: Exclude interned flags from constant flags Changed paths: M Zend/zend_execute_API.c Diff: diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 363f401..7400840 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API..c @@ -612,7 +612,7 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope zend_ast_destroy(ast->ast); efree(ast); //??? - } else if (!zend_get_constant_ex(str_index->val, str_index->len, &const_value, scope, str_index->gc.u..v.flags TSRMLS_CC)) { + } else if (!zend_get_constant_ex(str_index->val, str_index->len, &const_value, scope, str_index->gc.u.v.flags & ~(IS_STR_PERSISTENT | IS_STR_INTERNED |IS_STR_PERMANENT) TSRMLS_CC)) { char *actual, *str; const char *save = str_index->val; int len;

« previous php.cvs (#77506) next »