]> granicus.if.org Git - php/commitdiff
MFH: Fix a leak with pconn and mysqlnd
authorAndrey Hristov <andrey@php.net>
Tue, 22 Jul 2008 17:41:15 +0000 (17:41 +0000)
committerAndrey Hristov <andrey@php.net>
Tue, 22 Jul 2008 17:41:15 +0000 (17:41 +0000)
ext/mysql/php_mysql.c

index a70a5e5b6b8a94b41777f12b4cc766d143253adf..6908b294bdeb9bdd516b991d334e9187e3f0dd8c 100644 (file)
@@ -963,6 +963,14 @@ 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));