summaryrefslogtreecommitdiff
path: root/Zend/zend_variables.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2004-09-26 20:03:54 +0000
committerAndi Gutmans <andi@php.net>2004-09-26 20:03:54 +0000
commitf17aa81edc3aac9b80607bbaecc3c006dd52b4ae (patch)
treebcef73662f0cb9d5e58ef76283d8107c7e1d54d5 /Zend/zend_variables.c
parentd5bac133ee87aac7f5a09a33aa1b409b52a42657 (diff)
downloadphp-git-f17aa81edc3aac9b80607bbaecc3c006dd52b4ae.tar.gz
- Apply Thies and Sterling's patch which doesn't call ctor/dtor functions
- for types which don't require it (BOOL/NULL/LONG/DOUBLE) - Breaks serialization!!!
Diffstat (limited to 'Zend/zend_variables.c')
-rw-r--r--Zend/zend_variables.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index f147136a4d..8d6b247be5 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -27,11 +27,8 @@
#include "zend_list.h"
-ZEND_API void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC)
+ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC)
{
- if (zvalue->type==IS_LONG) {
- return;
- }
switch (zvalue->type & ~IS_CONSTANT_INDEX) {
case IS_STRING:
case IS_CONSTANT:
@@ -104,7 +101,7 @@ ZEND_API void zval_add_ref(zval **p)
}
-ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
+ZEND_API int _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC)
{
switch (zvalue->type) {
case IS_RESOURCE: {