Fwd: [PHP-CVS] cvs: php-src /ext/mysqli mysqli.c View as Markdown

Georg,

I held RC2 because I thought this was a critical engine bug. It happened
because instead of not implementing NULL you implemented it without a body.
Right now I changed it to NULL which means that any clone either via
"clone" or compatibility_mode will result in an error message that MySQLi
is not cloneable (no crash anymore).
Should I go ahead with RC2 right now or can you fix this in the very near
future?

Andi

From: "Andi Gutmans" andi@php.net
To: php-cvs@lists.php.net
Date: Thu, 15 Apr 2004 17:25:51 -0000
Subject: [PHP-CVS] cvs: php-src /ext/mysqli mysqli.c

andi Thu Apr 15 13:25:51 2004 EDT

Modified files:
/php-src/ext/mysqli mysqli.c
Log:

• Temporary fix for bug #27869
• George, you need to implement clone in order for "clone" and
• compatibility mode to work.

http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.37&r2=1.38&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.37 php-src/ext/mysqli/mysqli.c:1.38
--- php-src/ext/mysqli/mysqli.c:1.37 Sun Mar 21 13:27:23 2004
+++ php-src/ext/mysqli/mysqli.c Thu Apr 15 13:25:51 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter georg@php.net |
+----------------------------------------------------------------------+

• $Id: mysqli.c,v 1.37 2004/03/21 18:27:23 stas Exp $

• $Id: mysqli.c,v 1.38 2004/04/15 17:25:51 andi Exp $
  */

#ifdef HAVE_CONFIG_H
@@ -280,7 +280,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, mysqli_objects_clone TSRMLS_CC);

•   retval.handle = zend_objects_store_put(intern, NULL, 
  

mysqli_objects_free_storage, NULL /mysqli_objects_clone/ TSRMLS_CC);
retval.handlers = &mysqli_object_handlers;

    return retval;

@@ -353,7 +353,7 @@
REGISTER_INI_ENTRIES();

    memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), 

sizeof(zend_object_handlers));

•   mysqli_object_handlers.clone_obj = zend_objects_store_clone_obj;
  

•   mysqli_object_handlers.clone_obj = `NULL` 
  

/zend_objects_store_clone_obj/;
mysqli_object_handlers.read_property = mysqli_read_property;
mysqli_object_handlers.write_property = mysqli_write_property;
mysqli_object_handlers.get_property_ptr_ptr = NULL;

--
PHP CVS Mailing List (http://www.php.net/)