diff options
| author | Antony Dovgal <tony2001@php.net> | 2010-05-25 20:16:14 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2010-05-25 20:16:14 +0000 |
| commit | 435aa876fc35545454680bfa7bd7b0a37ce1f7e5 (patch) | |
| tree | 632dc7a9c2b9c1b991a8bd16ef219e3ddfc298d3 | |
| parent | 8d640749519996dbfd8d9a69774eae8379f1f6c5 (diff) | |
| download | php-git-435aa876fc35545454680bfa7bd7b0a37ce1f7e5.tar.gz | |
fix zend_std_get_static_property() in ZTS mode
| -rw-r--r-- | Zend/zend_API.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 8077fbba54..6517517734 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1043,7 +1043,11 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC ) { 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 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC *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 } } } |