summaryrefslogtreecommitdiff
path: root/Zend/zend_variables.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2002-03-15 16:26:17 +0000
committerAndi Gutmans <andi@php.net>2002-03-15 16:26:17 +0000
commitc84a4ead958c0b052d0db918a07861f3cf7b98d0 (patch)
tree20ab67301b2bdf6853dc7b1590d245c6a350638b /Zend/zend_variables.c
parentdb84afb206c8fe93539e9aa4465258ef6f8d7821 (diff)
downloadphp-git-c84a4ead958c0b052d0db918a07861f3cf7b98d0.tar.gz
- Pass TSRMLS to callbacks.
Diffstat (limited to 'Zend/zend_variables.c')
-rw-r--r--Zend/zend_variables.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index b7846211c0..f800150204 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -54,9 +54,14 @@ ZEND_API void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC)
}
break;
case IS_OBJECT:
- Z_OBJ_HT_P(zvalue)->del_ref(zvalue);
+ {
+ TSRMLS_FETCH();
+
+ Z_OBJ_HT_P(zvalue)->del_ref(zvalue TSRMLS_CC);
+ }
break;
- case IS_RESOURCE: {
+ case IS_RESOURCE:
+ {
TSRMLS_FETCH();
/* destroy resource */
@@ -119,11 +124,14 @@ ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
}
break;
case IS_OBJECT:
+ {
+ TSRMLS_FETCH();
#if 0
- zvalue->value.obj = zvalue->value.obj.handlers->clone_obj(zvalue->value.obj.handle);
+ zvalue->value.obj = zvalue->value.obj.handlers->clone_obj(zvalue->value.obj.handle);
#else
- Z_OBJ_HT_P(zvalue)->add_ref(zvalue);
+ Z_OBJ_HT_P(zvalue)->add_ref(zvalue TSRMLS_CC);
#endif
+ }
break;
}
return SUCCESS;