cvs: ZendEngine2(PHP_5_1) / zend_objects_API.c
| From: | Dmitry Stogov | Date: | Tue, 15 Nov 2005 12:41:31 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_1) / zend_objects_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4330@lists.php.net to get a copy of this message | ||
dmitry Tue Nov 15 07:41:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/ZendEngine2 zend_objects_API.c
Log:
Fixed call to __destruct() for objects of classes delivered from internal ones those use
zend_objects_store_put(obj, NULL, ...
http://cvs.php.net/diff.php/ZendEngine2/zend_objects_API.c?r1=1.47.2.2&r2=1.47.2.3&ty=u
Index: ZendEngine2/zend_objects_API.c
diff -u ZendEngine2/zend_objects_API.c:1.47.2.2 ZendEngine2/zend_objects_API.c:1.47.2.3
--- ZendEngine2/zend_objects_API.c:1.47.2.2 Mon Oct 10 10:31:12 2005
+++ ZendEngine2/zend_objects_API.c Tue Nov 15 07:41:31 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_objects_API.c,v 1.47.2.2 2005/10/10 14:31:12 iliaa Exp $ */
+/* $Id: zend_objects_API.c,v 1.47.2.3 2005/11/15 12:41:31 dmitry Exp $ */
#include "zend.h"
#include "zend_globals.h"
@@ -111,7 +111,7 @@
obj->refcount = 1;
obj->object = object;
- obj->dtor = dtor;
+ obj->dtor = dtor?dtor:(zend_objects_store_dtor_t)zend_objects_destroy_object;
obj->free_storage = free_storage;
obj->clone = clone;