Revert "Fixed bug #74878"

dstogov · dstogov · commit 161c378cc861 · 2017-07-10T12:21:58.000+03:00
This reverts commit 9069734.
diff --git a/NEWS b/NEWS
@@ -9,7 +9,6 @@ PHP                                                                        NEWS
     unserialize). (Nikita)
   . Fixed bug #74819 (wddx_deserialize() heap out-of-bound read via
     php_parse_date()). (Derick)
-  . Fixed bug #74878 (Data race in ZTS builds). (Nikita)
   . Fixed bug #49649 (unserialize() doesn't handle changes in property 
     visibility). (pmmaga)
 
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -3742,10 +3742,6 @@ ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, z
 				break;
 		}
 	}
-
-	/* Must be interned to avoid ZTS data races */
-	name = zend_new_interned_string(zend_string_copy(name));
-
 	if (access_type & ZEND_ACC_PUBLIC) {
 		property_info->name = zend_string_copy(name);
 	} else if (access_type & ZEND_ACC_PRIVATE) {

Original file line number	Diff line number	Diff line change
`@@ -3742,10 +3742,6 @@ ZEND_API int zend_declare_property_ex(zend_class_entry ce, zend_string name, z`
`3742`	`3742`	`break;`
`3743`	`3743`	`}`
`3744`	`3744`	`}`
`3745`		`-`
`3746`		`- /* Must be interned to avoid ZTS data races */`
`3747`		`- name = zend_new_interned_string(zend_string_copy(name));`
`3748`		`-`
`3749`	`3745`	`if (access_type & ZEND_ACC_PUBLIC) {`
`3750`	`3746`	`property_info->name = zend_string_copy(name);`
`3751`	`3747`	`} else if (access_type & ZEND_ACC_PRIVATE) {`