andrey Tue Jul 22 17:40:43 2008 UTC Modified files: /php-src/ext/mysql php_mysql.c Log: Fix a leak with pconn and mysqlnd http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.261&r2=1.262&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.261 php-src/ext/mysql/php_mysql.c:1.262 --- php-src/ext/mysql/php_mysql.c:1.261 Mon Jul 21 13:01:41 2008 +++ php-src/ext/mysql/php_mysql.c Tue Jul 22 17:40:43 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.261 2008/07/21 13:01:41 andrey Exp $ */ +/* $Id: php_mysql.c,v 1.262 2008/07/22 17:40:43 andrey Exp $ */ /* TODO: * @@ -1005,6 +1005,15 @@ 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