uw Fri, 01 Oct 2010 08:54:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303911
Log:
Fix leak with persistent connections when using mysqli.default_host is used
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c
U php/php-src/trunk/ext/mysqli/mysqli_nonapi.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c 2010-10-01
00:12:23 UTC (rev 303910)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c 2010-10-01
08:54:16 UTC (rev 303911)
@@ -123,10 +123,6 @@
flags &= ~CLIENT_LOCAL_FILES;
}
}
- 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 (!socket_len || !socket) {
socket = MyG(default_socket);
@@ -145,6 +141,11 @@
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 (strlen(SAFE_STR(hostname)) > 2 && !strncasecmp(hostname, "p:", 2)) {
hostname += 2;
if (!MyG(allow_persistent)) {
Modified: php/php-src/trunk/ext/mysqli/mysqli_nonapi.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2010-10-01 00:12:23 UTC
(rev 303910)
+++ php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2010-10-01 08:54:16 UTC
(rev 303911)
@@ -123,10 +123,6 @@
flags &= ~CLIENT_LOCAL_FILES;
}
}
- 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 (!socket_len || !socket) {
socket = MyG(default_socket);
@@ -145,6 +141,11 @@
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 (strlen(SAFE_STR(hostname)) > 2 && !strncasecmp(hostname, "p:", 2)) {
hostname += 2;
if (!MyG(allow_persistent)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
