From b5af9e85992c74fa1e375767423ab43cdaf52fa2 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 20 May 2014 13:19:21 +0400 Subject: More accurate mysql_close() --- ext/mysql/php_mysql.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 94bfb6cfd2..580296a3cf 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1125,15 +1125,15 @@ PHP_FUNCTION(mysql_close) mysqlnd_end_psession(mysql->conn); } #endif - if (!mysql_link) { - --GC_REFCOUNT(res); + if (res == MySG(default_link)) { + zend_list_delete(res); MySG(default_link) = NULL; - } else if (mysql_link && Z_RES_P(mysql_link) == MySG(default_link)) { - --GC_REFCOUNT(res); - MySG(default_link) = NULL; - zend_list_close(res); - } else { - zend_list_close(res); + } + if (mysql_link) { + /* we have at least 3 additional references to this resource ??? */ + if (GC_REFCOUNT(res) <= 3) { + zend_list_close(res); + } } } -- cgit v1.2.1