Fix a problem with $mysqi->connect() not working with default values.

Fix a leak, bug#39457

6 files changed, 48 insertions, 20 deletions

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 49cf91c110..d650563844 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -54,9 +54,6 @@ MYSQLND_ZVAL_PCACHE *mysqli_mysqlnd_zval_cache;
 MYSQLND_QCACHE		*mysqli_mysqlnd_qcache;
 #endif
 
-
-extern void php_mysqli_connect(INTERNAL_FUNCTION_PARAMETERS);
-
 typedef int (*mysqli_read_t)(mysqli_object *obj, zval **retval TSRMLS_DC);
 typedef int (*mysqli_write_t)(mysqli_object *obj, zval *newval TSRMLS_DC);
 
@@ -433,7 +430,7 @@ static union _zend_function *php_mysqli_constructor_get(zval *object TSRMLS_DC)
 
 		f.type = ZEND_INTERNAL_FUNCTION;
 		if (obj->zo.ce == mysqli_link_class_entry) {
-			f.handler = ZEND_FN(mysqli_connect);
+			f.handler = ZEND_FN(mysqli_link_construct);
 		} else if (obj->zo.ce == mysqli_stmt_class_entry) {
 			f.handler = ZEND_FN(mysqli_stmt_construct);
 		} else if (obj->zo.ce == mysqli_result_class_entry) {
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 343e51df31..7ee47dd443 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1595,7 +1595,7 @@ PHP_FUNCTION(mysqli_prepare)
    Open a connection to a mysql server */ 
 PHP_FUNCTION(mysqli_real_connect)
 {
-	mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE);
+	mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, TRUE, FALSE);
 }
 /* }}} */
 
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index 6c6cbf5587..02ad086596 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -209,7 +209,7 @@ const zend_function_entry mysqli_link_methods[] = {
 	PHP_FALIAS(set_local_infile_handler,mysqli_set_local_infile_handler,NULL)
 #endif
 	PHP_FALIAS(multi_query,mysqli_multi_query,NULL)
-	PHP_FALIAS(mysqli,mysqli_connect,NULL)
+	PHP_FALIAS(mysqli,mysqli_link_construct,NULL)
 	PHP_FALIAS(more_results,mysqli_more_results, NULL)
 	PHP_FALIAS(next_result, mysqli_next_result, NULL)
 	PHP_FALIAS(options,mysqli_options,NULL)
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 7f520f4347..ffc539242a 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -33,7 +33,7 @@
 
 #define SAFE_STR(a) ((a)?a:"")
 
-void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_connect)
+void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_connect, zend_bool in_ctor)
 {
 	MY_MYSQL			*mysql = NULL;
 	MYSQLI_RESOURCE		*mysqli_resource = NULL;
@@ -48,7 +48,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 	zend_rsrc_list_entry	*le;
 	mysqli_plist_entry *plist = NULL;
 
-	if (getThis() && !ZEND_NUM_ARGS()) {
+	if (getThis() && !ZEND_NUM_ARGS() && in_ctor) {
 		RETURN_NULL();
 	}
 	hostname = username = dbname = passwd = socket = NULL;
@@ -61,14 +61,14 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 
 		if (object && instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry TSRMLS_CC)) {
 			mysqli_resource = ((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->ptr;
-			if (mysqli_resource && mysqli_resource->ptr &&
-				mysqli_resource->status > MYSQLI_STATUS_INITIALIZED)
-			{
-				mysql = (MY_MYSQL*)mysqli_resource->ptr;
-				php_clear_mysql(mysql);
-				if (mysql->mysql) {
-					mysqli_close(mysql->mysql, MYSQLI_CLOSE_EXPLICIT);
-					mysql->mysql = NULL;
+			if (mysqli_resource && mysqli_resource->ptr) {
+				mysql = (MY_MYSQL*) mysqli_resource->ptr;			
+				if (mysqli_resource->status > MYSQLI_STATUS_INITIALIZED) {
+					php_clear_mysql(mysql);
+					if (mysql->mysql) {
+						mysqli_close(mysql->mysql, MYSQLI_CLOSE_EXPLICIT);
+						mysql->mysql = NULL;
+					}
 				}
 			}
 		}
@@ -76,7 +76,6 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 			mysql = (MY_MYSQL *) ecalloc(1, sizeof(MY_MYSQL));
 		}
 		flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */
-
 	} else {
 		/* We have flags too */
 		if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|sssslsl", &object, mysqli_link_class_entry,
@@ -84,6 +83,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 										&flags) == FAILURE) {
 			return;
 		}
+
 		mysqli_resource = ((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->ptr;
 		MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &object, "mysqli_link", MYSQLI_STATUS_INITIALIZED);
 
@@ -188,7 +188,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne
 								MyG(num_active_persistent) + MyG(num_inactive_persistent));
 		goto err;
 	}
-	if (!is_real_connect) {
+	if (!is_real_connect && !mysql->mysql) {
 #if !defined(HAVE_MYSQLND)
 		if (!(mysql->mysql = mysql_init(NULL))) {
 #else
@@ -285,7 +285,16 @@ err:
    Open a connection to a mysql server */ 
 PHP_FUNCTION(mysqli_connect)
 {
-	mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE);
+	mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, FALSE);
+}
+/* }}} */
+
+
+/* {{{ proto object mysqli_link_construct()
+  */ 
+PHP_FUNCTION(mysqli_link_construct)
+{
+	mysqli_common_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, FALSE, TRUE);
 }
 /* }}} */
 
diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index df5a79af7c..2563efb5d5 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -344,7 +344,7 @@ PHP_MYSQLI_API void mysqli_register_stmt(zval *return_value, void *stmt TSRMLS_D
 PHP_MYSQLI_API void mysqli_register_result(zval *return_value, void *result TSRMLS_DC);
 PHP_MYSQLI_API void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC);
 
-void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_connect);
+void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_connect, zend_bool in_ctor);
 
 
 ZEND_BEGIN_MODULE_GLOBALS(mysqli)
@@ -441,6 +441,7 @@ PHP_FUNCTION(mysqli_info);
 PHP_FUNCTION(mysqli_insert_id);
 PHP_FUNCTION(mysqli_init);
 PHP_FUNCTION(mysqli_kill);
+PHP_FUNCTION(mysqli_link_construct);
 PHP_FUNCTION(mysqli_set_local_infile_default);
 PHP_FUNCTION(mysqli_set_local_infile_handler);
 PHP_FUNCTION(mysqli_more_results);
diff --git a/ext/mysqli/tests/bug39457.phpt b/ext/mysqli/tests/bug39457.phpt
new file mode 100644
index 0000000000..b834ff1b70
--- /dev/null
+++ b/ext/mysqli/tests/bug39457.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #39457 (Multiple invoked OO connections never close)
+--SKIPIF--
+<?php 
+require_once('skipif.inc'); 
+require_once('skipifconnectfailure.inc');
+?>
+--FILE--
+<?php
+	include "connect.inc";
+
+	$mysql = mysqli_init();
+	$mysql->connect($host, $user, $passwd, $db, $port, $socket);
+
+	$mysql->connect($host, $user, $passwd, $db, $port, $socket);
+
+	$mysql->close();
+	echo "OK\n";
+?>
+--EXPECT--
+OK