cvs: php-src(PHP_5_0) / NEWS /ext/dom php_dom.c /ext/spl spl_array.c spl_iterators.c /ext/sqlite sqlite.c /ext/tidy tidy.c /ext/xsl php_xsl.c
| From: | Antony Dovgal | Date: | Mon, 14 Nov 2005 21:57:18 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / NEWS /ext/dom php_dom.c /ext/spl spl_array.c spl_iterators.c /ext/sqlite sqlite.c /ext/tidy tidy.c /ext/xsl php_xsl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-35111@lists.php.net to get a copy of this message | ||
tony2001 Mon Nov 14 16:57:18 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/sqlite sqlite.c
/php-src/ext/dom php_dom.c
/php-src/ext/spl spl_array.c spl_iterators.c
/php-src/ext/xsl php_xsl.c
/php-src/ext/tidy tidy.c
Log:
MFH: fix #35197 (Destructor is not called) and similar issues in other extensions
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.511&r2=1.1760.2.512&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.511 php-src/NEWS:1.1760.2.512 --- php-src/NEWS:1.1760.2.511 Tue Nov 8 09:45:03 2005 +++ php-src/NEWS Mon Nov 14 16:57:14 2005 @@ -4,6 +4,7 @@ - Fixed an error in mysqli_fetch_fields (returned NULL instead of an array when row number > field_count). (Georg) - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- Fixed bug #35197 (Destructor is not called). (Tony) - Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compiled as shared). (Dmitry) - Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.146.2.8&r2=1.146.2.9&ty=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.146.2.8 php-src/ext/sqlite/sqlite.c:1.146.2.9 --- php-src/ext/sqlite/sqlite.c:1.146.2.8 Tue Oct 18 10:52:34 2005 +++ php-src/ext/sqlite/sqlite.c Mon Nov 14 16:57:16 2005 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.146.2.8 2005/10/18 14:52:34 tony2001 Exp $ + $Id: sqlite.c,v 1.146.2.9 2005/11/14 21:57:16 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H @@ -802,7 +802,7 @@ 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; } @@ -1076,7 +1076,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.146.2.8 2005/10/18 14:52:34 tony2001 Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.146.2.9 2005/11/14 21:57:16 tony2001 Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.60.2.9&r2=1.60.2.10&ty=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.60.2.9 php-src/ext/dom/php_dom.c:1.60.2.10 --- php-src/ext/dom/php_dom.c:1.60.2.9 Tue Sep 20 02:00:41 2005 +++ php-src/ext/dom/php_dom.c Mon Nov 14 16:57:16 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.60.2.9 2005/09/20 06:00:41 dmitry Exp $ */ +/* $Id: php_dom.c,v 1.60.2.10 2005/11/14 21:57:16 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -989,7 +989,7 @@ 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); @@ -1006,7 +1006,7 @@ 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); http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.49.2.8&r2=1.49.2.9&ty=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.49.2.8 php-src/ext/spl/spl_array.c:1.49.2.9 --- php-src/ext/spl/spl_array.c:1.49.2.8 Mon Sep 19 14:51:37 2005 +++ php-src/ext/spl/spl_array.c Mon Nov 14 16:57:16 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.49.2.8 2005/09/19 18:51:37 tony2001 Exp $ */ +/* $Id: spl_array.c,v 1.49.2.9 2005/11/14 21:57:16 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -191,7 +191,7 @@ } zend_hash_internal_pointer_reset_ex(HASH_OF(intern->array), &intern->pos); - 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; http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.11&r2=1.38.2.12&ty=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.38.2.11 php-src/ext/spl/spl_iterators.c:1.38.2.12 --- php-src/ext/spl/spl_iterators.c:1.38.2.11 Mon Sep 19 15:11:18 2005 +++ php-src/ext/spl/spl_iterators.c Mon Nov 14 16:57:17 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.38.2.11 2005/09/19 19:11:18 helly Exp $ */ +/* $Id: spl_iterators.c,v 1.38.2.12 2005/11/14 21:57:17 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -471,7 +471,7 @@ 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; } @@ -915,7 +915,7 @@ 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; } http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.c?r1=1.22.2.6&r2=1.22.2.7&ty=u Index: php-src/ext/xsl/php_xsl.c diff -u php-src/ext/xsl/php_xsl.c:1.22.2.6 php-src/ext/xsl/php_xsl.c:1.22.2.7 --- php-src/ext/xsl/php_xsl.c:1.22.2.6 Mon Jan 17 11:06:57 2005 +++ php-src/ext/xsl/php_xsl.c Mon Nov 14 16:57:17 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xsl.c,v 1.22.2.6 2005/01/17 16:06:57 chregu Exp $ */ +/* $Id: php_xsl.c,v 1.22.2.7 2005/11/14 21:57:17 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -118,7 +118,7 @@ zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); ALLOC_HASHTABLE(intern->parameter); zend_hash_init(intern->parameter, 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; http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.56.2.5&r2=1.56.2.6&ty=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.56.2.5 php-src/ext/tidy/tidy.c:1.56.2.6 --- php-src/ext/tidy/tidy.c:1.56.2.5 Tue Feb 8 00:29:48 2005 +++ php-src/ext/tidy/tidy.c Mon Nov 14 16:57:17 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.56.2.5 2005/02/08 05:29:48 rasmus Exp $ */ +/* $Id: tidy.c,v 1.56.2.6 2005/11/14 21:57:17 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -564,7 +564,7 @@ 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; } @@ -945,7 +945,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.56.2.5 2005/02/08 05:29:48 rasmus Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.56.2.6 2005/11/14 21:57:17 tony2001 Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES();
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.511&r2=1.1760.2.512&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.511 php-src/NEWS:1.1760.2.512 --- php-src/NEWS:1.1760.2.511 Tue Nov 8 09:45:03 2005 +++ php-src/NEWS Mon Nov 14 16:57:14 2005 @@ -4,6 +4,7 @@ - Fixed an error in mysqli_fetch_fields (returned NULL instead of an array when row number > field_count). (Georg) - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- Fixed bug #35197 (Destructor is not called). (Tony) - Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compiled as shared). (Dmitry) - Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.146.2.8&r2=1.146.2.9&ty=u Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.146.2.8 php-src/ext/sqlite/sqlite.c:1.146.2.9 --- php-src/ext/sqlite/sqlite.c:1.146.2.8 Tue Oct 18 10:52:34 2005 +++ php-src/ext/sqlite/sqlite.c Mon Nov 14 16:57:16 2005 @@ -17,7 +17,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.146.2.8 2005/10/18 14:52:34 tony2001 Exp $ + $Id: sqlite.c,v 1.146.2.9 2005/11/14 21:57:16 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H @@ -802,7 +802,7 @@ 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; } @@ -1076,7 +1076,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.146.2.8 2005/10/18 14:52:34 tony2001 Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.146.2.9 2005/11/14 21:57:16 tony2001 Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.60.2.9&r2=1.60.2.10&ty=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.60.2.9 php-src/ext/dom/php_dom.c:1.60.2.10 --- php-src/ext/dom/php_dom.c:1.60.2.9 Tue Sep 20 02:00:41 2005 +++ php-src/ext/dom/php_dom.c Mon Nov 14 16:57:16 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.60.2.9 2005/09/20 06:00:41 dmitry Exp $ */ +/* $Id: php_dom.c,v 1.60.2.10 2005/11/14 21:57:16 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -989,7 +989,7 @@ 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); @@ -1006,7 +1006,7 @@ 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); http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.49.2.8&r2=1.49.2.9&ty=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.49.2.8 php-src/ext/spl/spl_array.c:1.49.2.9 --- php-src/ext/spl/spl_array.c:1.49.2.8 Mon Sep 19 14:51:37 2005 +++ php-src/ext/spl/spl_array.c Mon Nov 14 16:57:16 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.49.2.8 2005/09/19 18:51:37 tony2001 Exp $ */ +/* $Id: spl_array.c,v 1.49.2.9 2005/11/14 21:57:16 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -191,7 +191,7 @@ } zend_hash_internal_pointer_reset_ex(HASH_OF(intern->array), &intern->pos); - 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; http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.11&r2=1.38.2.12&ty=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.38.2.11 php-src/ext/spl/spl_iterators.c:1.38.2.12 --- php-src/ext/spl/spl_iterators.c:1.38.2.11 Mon Sep 19 15:11:18 2005 +++ php-src/ext/spl/spl_iterators.c Mon Nov 14 16:57:17 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.38.2.11 2005/09/19 19:11:18 helly Exp $ */ +/* $Id: spl_iterators.c,v 1.38.2.12 2005/11/14 21:57:17 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -471,7 +471,7 @@ 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; } @@ -915,7 +915,7 @@ 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; } http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.c?r1=1.22.2.6&r2=1.22.2.7&ty=u Index: php-src/ext/xsl/php_xsl.c diff -u php-src/ext/xsl/php_xsl.c:1.22.2.6 php-src/ext/xsl/php_xsl.c:1.22.2.7 --- php-src/ext/xsl/php_xsl.c:1.22.2.6 Mon Jan 17 11:06:57 2005 +++ php-src/ext/xsl/php_xsl.c Mon Nov 14 16:57:17 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xsl.c,v 1.22.2.6 2005/01/17 16:06:57 chregu Exp $ */ +/* $Id: php_xsl.c,v 1.22.2.7 2005/11/14 21:57:17 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -118,7 +118,7 @@ zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); ALLOC_HASHTABLE(intern->parameter); zend_hash_init(intern->parameter, 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; http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.56.2.5&r2=1.56.2.6&ty=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.56.2.5 php-src/ext/tidy/tidy.c:1.56.2.6 --- php-src/ext/tidy/tidy.c:1.56.2.5 Tue Feb 8 00:29:48 2005 +++ php-src/ext/tidy/tidy.c Mon Nov 14 16:57:17 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tidy.c,v 1.56.2.5 2005/02/08 05:29:48 rasmus Exp $ */ +/* $Id: tidy.c,v 1.56.2.6 2005/11/14 21:57:17 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -564,7 +564,7 @@ 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; } @@ -945,7 +945,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); - php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.56.2.5 2005/02/08 05:29:48 rasmus Exp $)"); + php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.56.2.6 2005/11/14 21:57:17 tony2001 Exp $)"); php_info_print_table_end(); DISPLAY_INI_ENTRIES();