diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-20 13:19:21 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-20 13:19:21 +0400 |
| commit | b5af9e85992c74fa1e375767423ab43cdaf52fa2 (patch) | |
| tree | 0e02a3bf83fc141a2293429650165dab3e35252d /ext/mysql/php_mysql.c | |
| parent | b36afe8dd330039685b2b74e13e385353d662cfc (diff) | |
| download | php-git-b5af9e85992c74fa1e375767423ab43cdaf52fa2.tar.gz | |
More accurate mysql_close()
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 16 |
1 files changed, 8 insertions, 8 deletions
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); + } } } |