diff options
| author | Andrey Hristov <andrey@php.net> | 2010-05-13 11:05:09 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-05-13 11:05:09 +0000 |
| commit | 6cefa510d606d6161bd1df709c2912dff75ecaec (patch) | |
| tree | eff69c729a809f2873246c774d1f8ca4bacaa350 /ext/mysqli/mysqli_api.c | |
| parent | fdfdb1480e81fe12402efc0480512982f40aacf2 (diff) | |
| download | php-git-6cefa510d606d6161bd1df709c2912dff75ecaec.tar.gz | |
Better fix for #51605
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 4be3e3baf7..57cc3187a9 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -551,8 +551,12 @@ PHP_FUNCTION(mysqli_character_set_name) /* {{{ php_mysqli_close */ -void php_mysqli_close(MY_MYSQL * mysql, int close_type TSRMLS_DC) +void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status TSRMLS_DC) { + if (resource_status > MYSQLI_STATUS_INITIALIZED) { + MyG(num_links)--; + } + if (!mysql->persistent) { mysqli_close(mysql->mysql, close_type); } else { @@ -569,7 +573,6 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type TSRMLS_DC) mysql->persistent = FALSE; } mysql->mysql = NULL; - MyG(num_links)--; php_clear_mysql(mysql); } @@ -589,7 +592,8 @@ PHP_FUNCTION(mysqli_close) MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_INITIALIZED); - php_mysqli_close(mysql, MYSQLI_CLOSE_EXPLICIT TSRMLS_CC); + php_mysqli_close(mysql, MYSQLI_CLOSE_EXPLICIT, ((MYSQLI_RESOURCE *)((mysqli_object *)zend_object_store_get_object(mysql_link TSRMLS_CC))->ptr)->status TSRMLS_CC); + ((MYSQLI_RESOURCE *)((mysqli_object *)zend_object_store_get_object(mysql_link TSRMLS_CC))->ptr)->status = MYSQLI_STATUS_UNKNOWN; MYSQLI_CLEAR_RESOURCE(&mysql_link); efree(mysql); |