com php-src: More accurate mysql_close(): ext/ldap/te sts/README ext/mysql/php_mysql.c
| From: | Dmitry Stogov | Date: | Tue, 20 May 2014 09:19:21 +0000 |
| Subject: | com php-src: More accurate mysql_close(): ext/ldap/te sts/README ext/mysql/php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78477@lists.php.net to get a copy of this message | ||
Commit: b5af9e85992c74fa1e375767423ab43cdaf52fa2
Author: Dmitry Stogov <dmitry@zend.com> Tue, 20 May 2014 13:19:21 +0400
Parents: b36afe8dd330039685b2b74e13e385353d662cfc
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b5af9e85992c74fa1e375767423ab43cdaf52fa2
Log:
More accurate mysql_close()
Changed paths:
M ext/ldap/tests/README
M ext/mysql/php_mysql.c
Diff:
diff --git a/ext/ldap/tests/README b/ext/ldap/tests/README
index 7dccd27..b30043a 100644
--- a/ext/ldap/tests/README
+++ b/ext/ldap/tests/README
@@ -10,7 +10,7 @@ Notes:
It is used for testing ldap_start_tls(), which also requires "TLS_REQCERT never" in
client configuration
2. An empty LDAP structure is required for the tests to be PASSed
-(/etc/openldap/)slapd.conf:
+ (/etc/openldap/)slapd.conf:
-----------------------------------------------------------
TLSCACertificateFile /etc/openldap/ssl/server.pem
TLSCertificateFile /etc/openldap/ssl/server.pem
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 94bfb6c..580296a 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);
+ }
}
}