svn: /php/php-src/trunk/Zend/ zend_API.c
| From: | Antony Dovgal | Date: | Tue, 25 May 2010 20:16:14 +0000 |
| Subject: | svn: /php/php-src/trunk/Zend/ zend_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62709@lists.php.net to get a copy of this message | ||
tony2001 Tue, 25 May 2010 20:16:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299754
Log:
fix zend_std_get_static_property() in ZTS mode
Changed paths:
U php/php-src/trunk/Zend/zend_API.c
Modified: php/php-src/trunk/Zend/zend_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_API.c 2010-05-25 19:19:45 UTC (rev 299753)
+++ php/php-src/trunk/Zend/zend_API.c 2010-05-25 20:16:14 UTC (rev 299754)
@@ -1043,7 +1043,11 @@
) {
Z_ADDREF_PP(p);
Z_SET_ISREF_PP(p);
+#if ZTS
+ CG(static_members_table)[(zend_intptr_t)(class_type->static_members_table)][i] = *p;
+#else
class_type->static_members_table[i] = *p;
+#endif
} else {
zval *r;
@@ -1051,7 +1055,11 @@
*r = **p;
INIT_PZVAL(r);
zval_copy_ctor(r);
+#if ZTS
+ CG(static_members_table)[(zend_intptr_t)(class_type->static_members_table)][i] = r;
+#else
class_type->static_members_table[i] = r;
+#endif
}
}
}