From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 1 Apr 2014 10:20:10 +0000 (+0400)
Subject: Exclude interned flags from constant flags
X-Git-Tag: POST_PHPNG_MERGE~412^2~189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70b7950a75609c4386f996fe7cb1a005447262b4;p=php

Exclude interned flags from constant flags
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 363f401230..7400840a49 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;