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.

1 files changed, 2 insertions, 0 deletions

diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h
index be099aee81..249effa10e 100644
--- a/Zend/zend_object_handlers.h
+++ b/Zend/zend_object_handlers.h
@@ -116,6 +116,8 @@ typedef HashTable *(*zend_object_get_gc_t)(zval *object, zval **table, int *n TS
 typedef int (*zend_object_do_operation_t)(zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC);
 
 struct _zend_object_handlers {
+	/* offset of real object header (usually zero) */
+	int										offset;
 	/* general object functions */
 	zend_object_free_obj_t					free_obj;
 	zend_object_dtor_obj_t					dtor_obj;