From: Andrey Hristov <andrey@php.net>
Date: Tue, 22 Jul 2008 17:40:43 +0000 (+0000)
Subject: Fix a leak with pconn and mysqlnd
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55773e7853ebaa19945cb58a9029265299d2fe72;p=php

Fix a leak with pconn and mysqlnd
---

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index f6a492b070..c767d849a9 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1005,6 +1005,15 @@ PHP_FUNCTION(mysql_close)
 	
 	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));