Revert "Fixed bug #74878"

This reverts commit 9069734b57a556a23f977915ee2819477c6d6720.

diff --git a/NEWS b/NEWS
index 70eb7715567b0368390b7b444dd3db0d4344af8f..d9bd26e0bdee8f1d07409459619ca59765ed5c77 100644 (file)
--- 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
index 609e8b4a515a3ac71c6ea1d720a9941229d8f9da..ca8b4e2f9974f43ce4e3105f374410d8bcc4fc34 100644 (file)
--- 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) {