com php-src: Copy default properties of internal classes for different threads: Zend/zend_API.c
| From: | Stanislav Malyshev | Date: | Thu, 05 Apr 2012 16:46:52 +0000 |
| Subject: | com php-src: Copy default properties of internal classes for different threads: Zend/zend_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68743@lists.php.net to get a copy of this message | ||
Commit: 82c05eeda99e646063abece28c2b1a7c0a414338
Author: Johannes Schlüter <johannes@schlueters.de> Thu, 5 Apr 2012 18:46:52 +0200
Committer: Stanislav Malyshev <stas@php.net> Wed, 11 Apr 2012 19:21:41 -0700
Parents: 05c8d4766c272e101b5279f0ec432e1b16e74637
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82c05eeda99e646063abece28c2b1a7c0a414338
Log:
Copy default properties of internal classes for different threads
Changed paths:
M Zend/zend_API.c
Diff:
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 71feccf..98a33e5 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1093,7 +1093,12 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry
*clas
for (i = 0; i < class_type->default_properties_count; i++) {
object->properties_table[i] = class_type->default_properties_table[i];
if (class_type->default_properties_table[i]) {
+#if ZTS
+ ALLOC_ZVAL( object->properties_table[i]);
+ MAKE_COPY_ZVAL(&class_type->default_properties_table[i],
object->properties_table[i]);
+#else
Z_ADDREF_P(object->properties_table[i]);
+#endif
}
}
object->properties = NULL;