summaryrefslogtreecommitdiff
path: root/Zend/zend_objects.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-04-09 01:50:15 +0400
committerDmitry Stogov <dmitry@zend.com>2014-04-09 01:50:15 +0400
commit7402af380b3a700dda0e89470770fde15bd56204 (patch)
tree4b8c1fdd87745f9ab0ce7f4fd32f07562d8772dc /Zend/zend_objects.c
parent0e7d30e8d3d3b7b637e64f6f1e2430d607d01dfc (diff)
downloadphp-git-7402af380b3a700dda0e89470770fde15bd56204.tar.gz
Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed).
Now we destroy objects it two steps. At first - object properties of all objects and only then the objects their selves.
Diffstat (limited to 'Zend/zend_objects.c')
-rw-r--r--Zend/zend_objects.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index 35b237e132..34a4ddf4a7 100644
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -128,13 +128,6 @@ ZEND_API void zend_objects_destroy_object(zend_object *object TSRMLS_DC)
}
}
-ZEND_API void zend_object_free(zend_object *object TSRMLS_DC)
-{
- zend_object_std_dtor(object TSRMLS_CC);
- GC_REMOVE_FROM_BUFFER(object);
- efree(object);
-}
-
ZEND_API zend_object *zend_objects_new(zend_class_entry *ce TSRMLS_DC)
{
zend_object *object = emalloc(sizeof(zend_object) + sizeof(zval) * (ce->default_properties_count - 1));