andrey Tue Jul 22 23:43:14 2008 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_nonapi.c
Log:
Two less failing tests, one of which was definitely a leak in mysqli with
mysqlnd
and pconn. ext/mysql is being fixed with a better fix for similar leak.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.262&r2=1.263&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.262 php-src/ext/mysql/php_mysql.c:1.263
--- php-src/ext/mysql/php_mysql.c:1.262 Tue Jul 22 17:40:43 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 22 23:43:14 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.262 2008/07/22 17:40:43 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.263 2008/07/22 23:43:14 andrey Exp $ */
/* TODO:
*
@@ -802,6 +802,9 @@
mysql->active_result_id = 0;
mysql->multi_query = client_flags &
CLIENT_MULTI_STATEMENTS? 1:0;
/* ensure that the link did not die */
+#if defined(MYSQL_USE_MYSQLND)
+ mysqlnd_end_psession(mysql->conn);
+#endif
if (mysql_ping(mysql->conn)) {
if (mysql_errno(mysql->conn) == 2006) {
if (UG(unicode)) {
@@ -1005,15 +1008,6 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
"MySQL-Link", le_link, le_plink);
-#ifdef MYSQL_USE_MYSQLND
- {
- int tmp;
- if ((mysql = zend_list_find(Z_RESVAL_PP(mysql_link), &tmp)) &&
tmp == le_plink) {
- mysqlnd_end_psession(mysql->conn);
- }
- }
-#endif
-
if (id==-1) { /* explicit resource number */
PHPMY_UNBUFFERED_QUERY_CHECK();
zend_list_delete(Z_RESVAL_PP(mysql_link));
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.84&r2=1.85&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.84
php-src/ext/mysqli/mysqli_nonapi.c:1.85
--- php-src/ext/mysqli/mysqli_nonapi.c:1.84 Tue Jun 24 11:19:07 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Jul 22 23:43:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.84 2008/06/24 11:19:07 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.85 2008/07/22 23:43:14 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -157,6 +157,9 @@
mysql->mysql =
zend_ptr_stack_pop(&plist->free_links);
MyG(num_inactive_persistent)--;
+#if defined(MYSQLI_USE_MYSQLND)
+
mysqlnd_end_psession(mysql->mysql);
+#endif
/* reset variables */
/* todo: option for
ping or change_user */
#if G0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
