diff options
| author | Andrey Hristov <andrey@php.net> | 2011-08-05 13:39:30 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2011-08-05 13:39:30 +0000 |
| commit | 534de602842089ae2579cce05050b3ce84db0202 (patch) | |
| tree | 5e3d1d530daee7c13f027905bdfb4e6cf9a3cdb2 /ext/mysqli/mysqli_nonapi.c | |
| parent | 1be5479980bd0b741f8de4b17c4cd318d9c85121 (diff) | |
| download | php-git-534de602842089ae2579cce05050b3ce84db0202.tar.gz | |
Fix for bug #55283 SSL options set by mysqli_ssl_set ignored for MySQLi persistent connections
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 8dbaed2bff..2844c4df1b 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -141,10 +141,12 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne hostname = MyG(default_host); } - if (mysql->mysql && mysqli_resource && (mysqli_resource->status > MYSQLI_STATUS_INITIALIZED || (strlen(SAFE_STR(hostname)) > 2 && !strncasecmp(hostname, "p:", 2)))) { - /* already connected, we should close the connection */ - php_mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT, mysqli_resource->status TSRMLS_CC); - } + if (mysql->mysql && mysqli_resource && + (mysqli_resource->status > MYSQLI_STATUS_INITIALIZED)) + { + /* already connected, we should close the connection */ + php_mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT, mysqli_resource->status TSRMLS_CC); + } if (strlen(SAFE_STR(hostname)) > 2 && !strncasecmp(hostname, "p:", 2)) { hostname += 2; |