From 77d73b814bc388e7dab0a68d371c03b7189f63b2 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Thu, 30 Sep 2010 18:10:03 +0000 Subject: Plug a leak in mysqli when in the same script a pconn is reused. Call end_psession earlier - so will mysqlnd and the plugins free data earlier. --- ext/mysql/php_mysql.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index bd0a6e7f07..9ab1b784d0 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -637,7 +637,7 @@ PHP_RSHUTDOWN_FUNCTION(mysql) efree(MySG(connect_error)); } -#ifdef MYSQL_USE_MYSQLND +#ifdef A0 && MYSQL_USE_MYSQLND zend_hash_apply(&EG(persistent_list), (apply_func_t) php_mysql_persistent_helper TSRMLS_CC); #endif @@ -888,7 +888,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) mysql->multi_query = 0; #endif /* ensure that the link did not die */ -#if defined(MYSQL_USE_MYSQLND) +#if A0 && defined(MYSQL_USE_MYSQLND) mysqlnd_end_psession(mysql->conn); #endif if (mysql_ping(mysql->conn)) { -- cgit v1.2.1