helly           Sun Mar  6 16:41:38 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src    NEWS 
    /php-src/ext/mysqli mysqli.c 
  Log:
  - MFH Bugfix #28840
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.274&r2=1.1760.2.275&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.274 php-src/NEWS:1.1760.2.275
--- php-src/NEWS:1.1760.2.274   Sun Mar  6 12:04:20 2005
+++ php-src/NEWS        Sun Mar  6 16:41:38 2005
@@ -143,6 +143,8 @@
   (Jani)
 - Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
   (eggert at gnu dot org, Jani)
+- Fixed bug #28840 (__destruct of a class that extends mysqli not called).
+  (Marcus)
 - Fixed bug #28804 (ini-file section parsing pattern is buggy).
   (wendland at scan-plus dot de)
 - Fixed bug #28451 (corrupt EXIF headers have unlimited recursive IFD directory
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.11&r2=1.43.2.12&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.43.2.11 
php-src/ext/mysqli/mysqli.c:1.43.2.12
--- php-src/ext/mysqli/mysqli.c:1.43.2.11       Thu Jan 27 09:39:21 2005
+++ php-src/ext/mysqli/mysqli.c Sun Mar  6 16:41:38 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.43.2.11 2005/01/27 14:39:21 tony2001 Exp $ 
+  $Id: mysqli.c,v 1.43.2.12 2005/03/06 21:41:38 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -328,7 +328,7 @@
        zend_hash_copy(intern->zo.properties, &class_type->default_properties, 
(copy_ctor_func_t) zval_add_ref,
                                        (void *) &tmp, sizeof(zval *));
 
-       retval.handle = zend_objects_store_put(intern, NULL, 
mysqli_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) mysqli_objects_free_storage, NULL 
TSRMLS_CC);
        retval.handlers = &mysqli_object_handlers;
 
        return retval;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to