tony2001 Mon Nov 14 17:03:04 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/sqlite sqlite.c
/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/tidy tidy.c
/php-src/ext/xmlreader php_xmlreader.c
Log:
MFH: fix #35197 (Destructor is not called) and similar issues in other
extensions
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.166.2.4&r2=1.166.2.5&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.4
php-src/ext/sqlite/sqlite.c:1.166.2.5
--- php-src/ext/sqlite/sqlite.c:1.166.2.4 Tue Oct 18 18:51:10 2005
+++ php-src/ext/sqlite/sqlite.c Mon Nov 14 17:02:58 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.166.2.4 2005/10/18 22:51:10 iliaa Exp $
+ $Id: sqlite.c,v 1.166.2.5 2005/11/14 22:02:58 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -830,7 +830,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;
}
@@ -1125,7 +1125,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.166.2.4 2005/10/18 22:51:10 iliaa
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.5 2005/11/14 22:02:58
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.73.2.3&r2=1.73.2.4&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.3 php-src/ext/dom/php_dom.c:1.73.2.4
--- php-src/ext/dom/php_dom.c:1.73.2.3 Sat Nov 5 17:25:12 2005
+++ php-src/ext/dom/php_dom.c Mon Nov 14 17:03:01 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.73.2.3 2005/11/05 22:25:12 rasmus Exp $ */
+/* $Id: php_dom.c,v 1.73.2.4 2005/11/14 22:03:01 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -994,7 +994,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);
@@ -1011,7 +1011,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.71.2.5&r2=1.71.2.6&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.5
php-src/ext/spl/spl_array.c:1.71.2.6
--- php-src/ext/spl/spl_array.c:1.71.2.5 Sun Oct 9 10:42:08 2005
+++ php-src/ext/spl/spl_array.c Mon Nov 14 17:03:01 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.71.2.5 2005/10/09 14:42:08 helly Exp $ */
+/* $Id: spl_array.c,v 1.71.2.6 2005/11/14 22:03:01 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 == spl_ce_ArrayIterator) {
retval.handlers = &spl_handler_ArrayIterator;
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.73.2.5&r2=1.73.2.6&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.5
php-src/ext/spl/spl_iterators.c:1.73.2.6
--- php-src/ext/spl/spl_iterators.c:1.73.2.5 Tue Nov 1 16:18:24 2005
+++ php-src/ext/spl/spl_iterators.c Mon Nov 14 17:03:01 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.5 2005/11/01 21:18:24 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.6 2005/11/14 22:03:01 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -687,7 +687,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;
}
@@ -1265,7 +1265,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.2.2.1&r2=1.2.2.2&ty=u
Index: php-src/ext/spl/spl_observer.c
diff -u php-src/ext/spl/spl_observer.c:1.2.2.1
php-src/ext/spl/spl_observer.c:1.2.2.2
--- php-src/ext/spl/spl_observer.c:1.2.2.1 Wed Sep 14 23:33:04 2005
+++ php-src/ext/spl/spl_observer.c Mon Nov 14 17:03:02 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_observer.c,v 1.2.2.1 2005/09/15 03:33:04 helly Exp $ */
+/* $Id: spl_observer.c,v 1.2.2.2 2005/11/14 22:03:02 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.32.2.1&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.32.2.1
--- 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 17:03:02 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.32.2.1 2005/11/14 22:03:02 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/tidy/tidy.c?r1=1.66.2.2&r2=1.66.2.3&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.2 php-src/ext/tidy/tidy.c:1.66.2.3
--- php-src/ext/tidy/tidy.c:1.66.2.2 Tue Oct 25 14:04:58 2005
+++ php-src/ext/tidy/tidy.c Mon Nov 14 17:03:02 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.66.2.2 2005/10/25 18:04:58 mike Exp $ */
+/* $Id: tidy.c,v 1.66.2.3 2005/11/14 22:03:02 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.66.2.2 2005/10/25 18:04:58 mike Exp
$)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.3 2005/11/14 22:03:02 tony2001
Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.1&r2=1.13.2.2&ty=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.1
php-src/ext/xmlreader/php_xmlreader.c:1.13.2.2
--- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.1 Thu Oct 13 17:20:11 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Mon Nov 14 17:03:02 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlreader.c,v 1.13.2.1 2005/10/13 21:20:11 rrichards Exp $ */
+/* $Id: php_xmlreader.c,v 1.13.2.2 2005/11/14 22:03:02 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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
