com php-src: Revert "Fixed bug #74878": NEWS Zend/zend_API. c
| From: | Dmitry Stogov | Date: | Mon, 10 Jul 2017 09:21:58 +0000 |
| Subject: | com php-src: Revert "Fixed bug #74878": NEWS Zend/zend_API. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98489@lists.php.net to get a copy of this message | ||
Commit: 161c378cc861fe01ea0034f5a6e8d32ad14f5ccb
Author: Dmitry Stogov <dmitry@zend.com> Mon, 10 Jul 2017 12:21:58 +0300
Parents: 5369006edfcd3b9765a7be0a1ad2575a57fe1ef9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=161c378cc861fe01ea0034f5a6e8d32ad14f5ccb
Log:
Revert "Fixed bug #74878"
This reverts commit 9069734b57a556a23f977915ee2819477c6d6720.
Bugs:
https://bugs.php.net/74878
Changed paths:
M NEWS
M Zend/zend_API.c
Diff:
diff --git a/NEWS b/NEWS
index 70eb771..d9bd26e 100644
--- 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 609e8b4..ca8b4e2 100644
--- 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) {