PHP mysqlnd svn commit: r1106 - in trunk: php5/ext/mysqli php6/ext/mysqli

[jschlueter]

Author: jschlueter
Date: 2007-10-17 13:02:05 +0200 (Wed, 17 Oct 2007)
New Revision: 1106

Modified:
   trunk/php5/ext/mysqli/mysqli.c
   trunk/php5/ext/mysqli/mysqli_api.c
   trunk/php6/ext/mysqli/mysqli.c
   trunk/php6/ext/mysqli/mysqli_api.c
Log:
Sync with PHP 5_3/HEAD CVS


Modified: trunk/php5/ext/mysqli/mysqli.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli.c	2007-10-16 20:44:15 UTC (rev 1105)
+++ trunk/php5/ext/mysqli/mysqli.c	2007-10-17 11:02:05 UTC (rev 1106)
@@ -15,7 +15,7 @@
   | Author: Georg Richter <georg@stripped>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.72.2.16.2.17.2.4 2007/10/16 13:20:14 tony2001 Exp $ 
+  $Id: mysqli.c,v 1.72.2.16.2.17.2.6 2007/10/17 08:18:09 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -202,7 +202,7 @@
 		mysql->hash_key = NULL;
 	}
 	if (mysql->li_read) {
-		zval_dtor(mysql->li_read);
+		zval_ptr_dtor(&(mysql->li_read));
 		mysql->li_read = NULL;
 	}
 }

Modified: trunk/php5/ext/mysqli/mysqli_api.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli_api.c	2007-10-16 20:44:15 UTC (rev 1105)
+++ trunk/php5/ext/mysqli/mysqli_api.c	2007-10-17 11:02:05 UTC (rev 1106)
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.4 2007/10/16 13:20:14 tony2001 Exp $ 
+  $Id: mysqli_api.c,v 1.118.2.22.2.16.2.6 2007/10/17 08:19:07 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1336,7 +1336,7 @@
 	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
 
 	if (mysql->li_read) {
-		zval_dtor(mysql->li_read);
+		zval_ptr_dtor(&(mysql->li_read));
 		mysql->li_read = NULL;
 	}
 }
@@ -1364,7 +1364,6 @@
 		efree(callback_name);
 		RETURN_FALSE;
 	}
-	efree(callback_name);
 
 	/* save callback function */
 	if (!mysql->li_read) {
@@ -1372,7 +1371,7 @@
 	} else {
 		zval_dtor(mysql->li_read);
 	}
-	ZVAL_STRINGL(mysql->li_read, Z_STRVAL_P(callback_func), Z_STRLEN_P(callback_func),
1);
+	ZVAL_STRING(mysql->li_read, callback_name, 0);
 
 	RETURN_TRUE;
 }

Modified: trunk/php6/ext/mysqli/mysqli.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli.c	2007-10-16 20:44:15 UTC (rev 1105)
+++ trunk/php6/ext/mysqli/mysqli.c	2007-10-17 11:02:05 UTC (rev 1106)
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli.c,v 1.111 2007/10/16 13:18:55 tony2001 Exp $ 
+  $Id: mysqli.c,v 1.112 2007/10/17 08:17:34 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -205,7 +205,7 @@
 		mysql->hash_key = NULL;
 	}
 	if (mysql->li_read) {
-		zval_dtor(mysql->li_read);
+		zval_ptr_dtor(&(mysql->li_read));
 		mysql->li_read = NULL;
 	}
 }

Modified: trunk/php6/ext/mysqli/mysqli_api.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli_api.c	2007-10-16 20:44:15 UTC (rev 1105)
+++ trunk/php6/ext/mysqli/mysqli_api.c	2007-10-17 11:02:05 UTC (rev 1106)
@@ -17,7 +17,7 @@
   |          Ulf Wendel <uw@stripped>                                     |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_api.c,v 1.151 2007/10/07 05:15:04 davidw Exp $ 
+  $Id: mysqli_api.c,v 1.153 2007/10/17 08:22:01 tony2001 Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -1403,7 +1403,7 @@
 	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
 
 	if (mysql->li_read) {
-		zval_dtor(mysql->li_read);
+		zval_ptr_dtor(&(mysql->li_read));
 		mysql->li_read = NULL;
 	}
 }
@@ -1415,7 +1415,7 @@
 {
 	MY_MYSQL	*mysql;
 	zval		*mysql_link;
-	zval		callback_name;
+	zval		callback_name, *p_callback_name;
 	zval		*callback_func;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz",
&mysql_link, mysqli_link_class_entry,
@@ -1435,7 +1435,6 @@
 		zval_dtor(&callback_name);
 		RETURN_FALSE;
 	}
-	zval_dtor(&callback_name);
 
 	/* save callback function */
 	if (!mysql->li_read) {
@@ -1443,7 +1442,8 @@
 	} else {
 		zval_dtor(mysql->li_read);
 	}
-	ZVAL_STRINGL(mysql->li_read, Z_STRVAL_P(callback_func), Z_STRLEN_P(callback_func),
1);
+	p_callback_name = &callback_name;
+	ZVAL_ZVAL(mysql->li_read, p_callback_name, 0, 0);
 
 	RETURN_TRUE;
 }