Index: ext/tidy/tidy.c
===================================================================
RCS file: /repository/php-src/ext/tidy/tidy.c,v
retrieving revision 1.66.2.2
diff -u -p -d -r1.66.2.2 tidy.c
--- ext/tidy/tidy.c	25 Oct 2005 18:04:58 -0000	1.66.2.2
+++ ext/tidy/tidy.c	12 Nov 2005 08:39:44 -0000
@@ -598,7 +598,7 @@ static void tidy_object_new(zend_class_e
 			break;
 	}
 
-	retval->handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) tidy_object_free_storage, NULL TSRMLS_CC);
+	retval->handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) tidy_object_free_storage, NULL TSRMLS_CC);
 	retval->handlers = handlers;
 }
 
Index: ext/sqlite/sqlite.c
===================================================================
RCS file: /repository/php-src/ext/sqlite/sqlite.c,v
retrieving revision 1.166.2.4
diff -u -p -d -r1.166.2.4 sqlite.c
--- ext/sqlite/sqlite.c	18 Oct 2005 22:51:10 -0000	1.166.2.4
+++ ext/sqlite/sqlite.c	12 Nov 2005 08:39:45 -0000
@@ -830,7 +830,7 @@ static void sqlite_object_new(zend_class
 	zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 
-	retval->handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL TSRMLS_CC);
+	retval->handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL TSRMLS_CC);
 	retval->handlers = handlers;
 }
 
Index: ext/xsl/php_xsl.c
===================================================================
RCS file: /repository/php-src/ext/xsl/php_xsl.c,v
retrieving revision 1.32
diff -u -p -d -r1.32 php_xsl.c
--- ext/xsl/php_xsl.c	3 Aug 2005 14:08:23 -0000	1.32
+++ ext/xsl/php_xsl.c	12 Nov 2005 08:39:45 -0000
@@ -138,7 +138,7 @@ zend_object_value xsl_objects_new(zend_c
 	zend_hash_init(intern->parameter, 0, NULL, ZVAL_PTR_DTOR, 0);
 	ALLOC_HASHTABLE(intern->registered_phpfunctions);
 	zend_hash_init(intern->registered_phpfunctions, 0, NULL, ZVAL_PTR_DTOR, 0);
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) xsl_objects_free_storage, NULL TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) xsl_objects_free_storage, NULL TSRMLS_CC);
 	intern->handle = retval.handle;
 	retval.handlers = &xsl_object_handlers;
 	return retval;
Index: ext/dom/php_dom.c
===================================================================
RCS file: /repository/php-src/ext/dom/php_dom.c,v
retrieving revision 1.73.2.3
diff -u -p -d -r1.73.2.3 php_dom.c
--- ext/dom/php_dom.c	5 Nov 2005 22:25:12 -0000	1.73.2.3
+++ ext/dom/php_dom.c	12 Nov 2005 08:39:45 -0000
@@ -994,7 +994,7 @@ zend_object_value dom_objects_new(zend_c
 	
 	intern = dom_objects_set_class(class_type, 1 TSRMLS_CC);
 
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t)dom_objects_free_storage, dom_objects_clone TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t)dom_objects_free_storage, dom_objects_clone TSRMLS_CC);
 	intern->handle = retval.handle;
 	retval.handlers = dom_get_obj_handlers(TSRMLS_C);
 
@@ -1011,7 +1011,7 @@ zend_object_value dom_xpath_objects_new(
 	
 	intern = dom_objects_set_class(class_type, 1 TSRMLS_CC);
 
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t)dom_xpath_objects_free_storage, dom_objects_clone TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t)dom_xpath_objects_free_storage, dom_objects_clone TSRMLS_CC);
 	intern->handle = retval.handle;
 	retval.handlers = dom_get_obj_handlers(TSRMLS_C);
 
Index: ext/spl/spl_array.c
===================================================================
RCS file: /repository/php-src/ext/spl/spl_array.c,v
retrieving revision 1.71.2.5
diff -u -p -d -r1.71.2.5 spl_array.c
--- ext/spl/spl_array.c	9 Oct 2005 14:42:08 -0000	1.71.2.5
+++ ext/spl/spl_array.c	12 Nov 2005 08:39:45 -0000
@@ -146,7 +146,7 @@ static zend_object_value spl_array_objec
 		intern->ar_flags &= ~SPL_ARRAY_IS_REF;
 	}
 
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spl_array_object_free_storage, NULL TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) spl_array_object_free_storage, NULL TSRMLS_CC);
 	while (parent) {
 		if (parent == spl_ce_ArrayIterator) {
 			retval.handlers = &spl_handler_ArrayIterator;
Index: ext/spl/spl_iterators.c
===================================================================
RCS file: /repository/php-src/ext/spl/spl_iterators.c,v
retrieving revision 1.73.2.5
diff -u -p -d -r1.73.2.5 spl_iterators.c
--- ext/spl/spl_iterators.c	1 Nov 2005 21:18:24 -0000	1.73.2.5
+++ ext/spl/spl_iterators.c	12 Nov 2005 08:39:45 -0000
@@ -687,7 +687,7 @@ static zend_object_value spl_RecursiveIt
 	zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spl_RecursiveIteratorIterator_free_storage, NULL TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) spl_RecursiveIteratorIterator_free_storage, NULL TSRMLS_CC);
 	retval.handlers = &spl_handlers_rec_it_it;
 	return retval;
 }
@@ -1265,7 +1265,7 @@ static zend_object_value spl_dual_it_new
 	zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spl_dual_it_free_storage, NULL TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) spl_dual_it_free_storage, NULL TSRMLS_CC);
 	retval.handlers = &spl_handlers_dual_it;
 	return retval;
 }
Index: ext/spl/spl_observer.c
===================================================================
RCS file: /repository/php-src/ext/spl/spl_observer.c,v
retrieving revision 1.2.2.1
diff -u -p -d -r1.2.2.1 spl_observer.c
--- ext/spl/spl_observer.c	15 Sep 2005 03:33:04 -0000	1.2.2.1
+++ ext/spl/spl_observer.c	12 Nov 2005 08:39:45 -0000
@@ -110,7 +110,7 @@ static zend_object_value spl_object_stor
 
 	zend_hash_init(&intern->storage, 0, NULL, ZVAL_PTR_DTOR, 0);
 
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spl_SplOjectStorage_free_storage, NULL TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) spl_SplOjectStorage_free_storage, NULL TSRMLS_CC);
 	retval.handlers = &spl_handler_SplObjectStorage;
 	return retval;
 }