com php-src: Fixed tests/run-test/test009.phpt: Zend/zend_obj ect_handlers.c Zend/zend_objects_API.c

Commit: 51d7c4828a8025c4fedf7b38380d17f7a2464256 Author: Dmitry Stogov <dmitry@zend.com> Fri, 21 Feb 2014 15:48:56 +0400 Parents: bdeaf2ef555139b685ed283d58db2b1f40e61ef1 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51d7c4828a8025c4fedf7b38380d17f7a2464256 Log: Fixed tests/run-test/test009.phpt Changed paths: M Zend/zend_object_handlers.c M Zend/zend_objects_API.c Diff: diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index bf688df..bbda58c 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1604,7 +1604,7 @@ int zend_std_get_closure(zval *obj, zend_class_entry **ce_ptr, zend_function **f ZEND_API zend_object_handlers std_object_handlers = { zend_object_free, /* free_obj */ - zend_object_std_dtor, /* dtor_obj */ + zend_objects_destroy_object, /* dtor_obj */ zend_objects_clone_obj, /* clone_obj */ zend_std_read_property, /* read_property */ diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 8e406ec..6f80771 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -129,7 +129,7 @@ ZEND_API void zend_objects_store_del(zend_object *object TSRMLS_DC) /* {{{ */ */ if (EG(objects_store).object_buckets && IS_VALID(EG(objects_store).object_buckets[object->handle])) { - if (object->gc.refcount == 1) { + if (object->gc.refcount == 0) { int failure = 0; if (!(object->gc.u.v.flags & IS_OBJ_DESTRUCTOR_CALLED)) { @@ -146,7 +146,7 @@ ZEND_API void zend_objects_store_del(zend_object *object TSRMLS_DC) /* {{{ */ } } - if (object->gc.refcount == 1) { + if (object->gc.refcount == 0) { zend_uint handle = object->handle; //??? GC_REMOVE_ZOBJ_FROM_BUFFER(obj);