com php-src: Fixed constant name construction: Zend/zend_cons tants.c
| From: | Dmitry Stogov | Date: | Fri, 21 Feb 2014 20:20:57 +0000 |
| Subject: | com php-src: Fixed constant name construction: Zend/zend_cons tants.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78028@lists.php.net to get a copy of this message | ||
Commit: efae48d99611a8d35604fec38e29eff452b552d1
Author: Dmitry Stogov <dmitry@zend.com> Sat, 22 Feb 2014 00:20:57 +0400
Parents: 598a51844ca5eb391e7004de6f095dd594a578ea
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=efae48d99611a8d35604fec38e29eff452b552d1
Log:
Fixed constant name construction
Changed paths:
M Zend/zend_constants.c
Diff:
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 04162c8..cf9802b 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -398,7 +398,7 @@ ZEND_API int zend_get_constant_ex(const char *name, uint name_len, zval *result,
} else {
/* try lowercase */
zend_str_tolower(lcname->val + prefix_len + 1, const_name_len);
- lcname->h = 0; // reuse ???
+ STR_FORGET_HASH_VAL(lcname);
if ((c = zend_hash_find_ptr(EG(zend_constants), lcname)) != NULL) {
if ((c->flags & CONST_CS) == 0) {
found_const = 1;
@@ -478,8 +478,8 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)
} else {
char *slash = strrchr(c->name->val, '\\');
if (slash) {
- lowercase_name = STR_ALLOC(c->name->len, c->flags & CONST_PERSISTENT);
- zend_str_tolower_copy(lowercase_name->val, c->name->val, c->name->len);
+ lowercase_name = STR_INIT(c->name->val, c->name->len, c->flags &
CONST_PERSISTENT);
+ zend_str_tolower(lowercase_name->val, slash - c->name->val);
lowercase_name = zend_new_interned_string(lowercase_name TSRMLS_CC);
name = lowercase_name;
} else {