com php-src: IS_INTERNED is not always 0 in ZTS : Zend/zend_string.h
| From: | Dmitry Stogov | Date: | Wed, 09 Apr 2014 21:54:03 +0000 |
| Subject: | com php-src: IS_INTERNED is not always 0 in ZTS : Zend/zend_string.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77447@lists.php.net to get a copy of this message | ||
Commit: a6be32f59a0f0ae7088f5afc1e354e185a481130
Author: Nikita Popov <nikic@php.net> Wed, 9 Apr 2014 23:54:03 +0200
Parents: 19ccd7994235a127db0ed6f9582d324244d5fad1
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a6be32f59a0f0ae7088f5afc1e354e185a481130
Log:
IS_INTERNED is not always 0 in ZTS
The current implementation chooses to intern "" in ZTS. Either that
should be removed or IS_INTERNED needs to actually check the flag.
Changed paths:
M Zend/zend_string.h
Diff:
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 3072afd..6ff35fb 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -35,11 +35,7 @@ void zend_interned_strings_dtor(TSRMLS_D);
END_EXTERN_C()
-#ifndef ZTS
-# define IS_INTERNED(s) (GC_FLAGS(s) & IS_STR_INTERNED)
-#else
-# define IS_INTERNED(s) 0
-#endif
+#define IS_INTERNED(s) (GC_FLAGS(s) & IS_STR_INTERNED)
#define STR_HASH_VAL(s) zend_str_hash_val(s)
#define STR_FORGET_HASH_VAL(s) zend_str_forget_hash_val(s)