tony2001 Mon Nov 14 16:52:28 2005 EDT
Modified files:
/php-src/ext/dom php_dom.c
/php-src/ext/spl spl_array.c spl_iterators.c spl_observer.c
/php-src/ext/xsl php_xsl.c
/php-src/ext/xmlreader php_xmlreader.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/tidy tidy.c
Log:
fix #35197 (Destructor is not called) and similar issues in other extensions
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.81&r2=1.82&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.81 php-src/ext/dom/php_dom.c:1.82
--- php-src/ext/dom/php_dom.c:1.81 Sat Nov 5 17:32:55 2005
+++ php-src/ext/dom/php_dom.c Mon Nov 14 16:52:19 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.81 2005/11/05 22:32:55 rasmus Exp $ */
+/* $Id: php_dom.c,v 1.82 2005/11/14 21:52:19 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1001,7 +1001,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);
@@ -1018,7 +1018,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.86&r2=1.87&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.86 php-src/ext/spl/spl_array.c:1.87
--- php-src/ext/spl/spl_array.c:1.86 Sat Oct 29 11:37:56 2005
+++ php-src/ext/spl/spl_array.c Mon Nov 14 16:52:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.86 2005/10/29 15:37:56 helly Exp $ */
+/* $Id: spl_array.c,v 1.87 2005/11/14 21:52:25 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -146,7 +146,7 @@
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 == U_CLASS_ENTRY(spl_ce_ArrayIterator)) {
retval.handlers = &spl_handler_ArrayIterator;
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.96&r2=1.97&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.96
php-src/ext/spl/spl_iterators.c:1.97
--- php-src/ext/spl/spl_iterators.c:1.96 Tue Nov 1 16:17:51 2005
+++ php-src/ext/spl/spl_iterators.c Mon Nov 14 16:52:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.96 2005/11/01 21:17:51 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.97 2005/11/14 21:52:25 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -701,7 +701,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;
}
@@ -1375,7 +1375,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/spl/spl_observer.c?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/spl/spl_observer.c
diff -u php-src/ext/spl/spl_observer.c:1.4 php-src/ext/spl/spl_observer.c:1.5
--- php-src/ext/spl/spl_observer.c:1.4 Wed Sep 14 23:31:36 2005
+++ php-src/ext/spl/spl_observer.c Mon Nov 14 16:52:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_observer.c,v 1.4 2005/09/15 03:31:36 helly Exp $ */
+/* $Id: spl_observer.c,v 1.5 2005/11/14 21:52:25 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -110,7 +110,7 @@
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;
}
http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/xsl/php_xsl.c
diff -u php-src/ext/xsl/php_xsl.c:1.32 php-src/ext/xsl/php_xsl.c:1.33
--- php-src/ext/xsl/php_xsl.c:1.32 Wed Aug 3 10:08:23 2005
+++ php-src/ext/xsl/php_xsl.c Mon Nov 14 16:52:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.c,v 1.32 2005/08/03 14:08:23 sniper Exp $ */
+/* $Id: php_xsl.c,v 1.33 2005/11/14 21:52:25 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -138,7 +138,7 @@
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;
http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.c?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.17
php-src/ext/xmlreader/php_xmlreader.c:1.18
--- php-src/ext/xmlreader/php_xmlreader.c:1.17 Thu Oct 13 17:19:13 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Mon Nov 14 16:52:26 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlreader.c,v 1.17 2005/10/13 21:19:13 rrichards Exp $ */
+/* $Id: php_xmlreader.c,v 1.18 2005/11/14 21:52:26 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -362,7 +362,7 @@
ALLOC_HASHTABLE(intern->std.properties);
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) xmlreader_objects_free_storage,
xmlreader_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) xmlreader_objects_free_storage,
xmlreader_objects_clone TSRMLS_CC);
intern->handle = retval.handle;
retval.handlers = &xmlreader_object_handlers;
return retval;
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.175&r2=1.176&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.175 php-src/ext/sqlite/sqlite.c:1.176
--- php-src/ext/sqlite/sqlite.c:1.175 Tue Oct 18 18:50:43 2005
+++ php-src/ext/sqlite/sqlite.c Mon Nov 14 16:52:26 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.175 2005/10/18 22:50:43 iliaa Exp $
+ $Id: sqlite.c,v 1.176 2005/11/14 21:52:26 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -831,7 +831,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;
}
@@ -1126,7 +1126,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.175 2005/10/18 22:50:43 iliaa Exp
$");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.176 2005/11/14 21:52:26 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/tidy/tidy.c?r1=1.70&r2=1.71&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.70 php-src/ext/tidy/tidy.c:1.71
--- php-src/ext/tidy/tidy.c:1.70 Tue Oct 25 13:57:28 2005
+++ php-src/ext/tidy/tidy.c Mon Nov 14 16:52:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.70 2005/10/25 17:57:28 mike Exp $ */
+/* $Id: tidy.c,v 1.71 2005/11/14 21:52:27 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -598,7 +598,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;
}
@@ -983,7 +983,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.70 2005/10/25 17:57:28 mike Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.71 2005/11/14 21:52:27 tony2001 Exp
$)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
