andrey Tue Jul 22 17:41:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
MFH: Fix a leak with pconn and mysqlnd
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.22&r2=1.213.2.6.2.16.2.23&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.22
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.23
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.22 Mon Jul 21 12:58:51 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 22 17:41:15 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.22 2008/07/21 12:58:51 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.23 2008/07/22 17:41:15 andrey Exp $ */
/* TODO:
*
@@ -963,6 +963,14 @@
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));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
