Really fix return values

Author: kocsismate

ext/mysqli/mysqli_nonapi.c

@@ -355,15 +355,18 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, bool is_real_connect, b
 
 	mysql->multi_query = 0;
 
-	if (!object) {
-		MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);
-	} else {
+	if (object) {
 		ZEND_ASSERT(instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry));
 		(Z_MYSQLI_P(object))->ptr = mysqli_resource;
-	}
-
-	if (!in_ctor) {
 		RETURN_TRUE;
+	} else {
+		MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);
+		if (is_real_connect) {
+			zval_ptr_dtor(return_value);
+			RETURN_TRUE;
+		} else {
+			return;
+		}
 	}
 
 err:

ext/mysqli/tests/mysqli_connect_twice.phpt

@@ -59,14 +59,14 @@ require_once('skipifconnectfailure.inc');
 
     mysqli_close($link);
 
-    if (NULL !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
-        printf("[013] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+    if (true !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
+        printf("[013] Expecting true got %s/%s\n", gettype($tmp), $tmp);
 
     if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
         printf("[014] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
             $host, $user, $db, $port, $socket);
 
-    if (NULL !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
+    if (true !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
         printf("[015] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
 
     print "done!";

ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt

@@ -65,15 +65,15 @@ mysqli.max_links=-1
 
     mysqli_close($link);
 
-    if (NULL !== ($tmp = $link->connect($phost, $user, $passwd, $db, $port, $socket)))
+    if (true !== ($tmp = $link->connect($phost, $user, $passwd, $db, $port, $socket)))
         printf("[013] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
 
     if (!$link = mysqli_connect($phost, $user, $passwd, $db, $port, $socket))
         printf("[014] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
             $phost, $user, $db, $port, $socket);
 
-    if (NULL !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
-        printf("[015] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+    if (true !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
+        printf("[015] Expecting true got %s/%s\n", gettype($tmp), $tmp);
 
     printf("Flipping phost/host order\n");
 
@@ -127,15 +127,15 @@ mysqli.max_links=-1
 
     mysqli_close($link);
 
-    if (NULL !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
-        printf("[028] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+    if (true !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
+        printf("[028] Expecting true got %s/%s\n", gettype($tmp), $tmp);
 
     if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
         printf("[029] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
             $host, $user, $db, $port, $socket);
 
-    if (NULL !== ($tmp = $link->connect($phost, $user, $passwd, $db, $port, $socket)))
-        printf("[030] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+    if (true !== ($tmp = $link->connect($phost, $user, $passwd, $db, $port, $socket)))
+        printf("[030] Expecting true got %s/%s\n", gettype($tmp), $tmp);
 
     print "done!";
 ?>

ext/mysqli/tests/mysqli_pconn_twice.phpt

@@ -52,15 +52,15 @@ mysqli.max_links=-1
 
     mysqli_close($link);
 
-    if (NULL !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
-        printf("[013] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+    if (true !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
+        printf("[013] Expecting true got %s/%s\n", gettype($tmp), $tmp);
 
     if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
         printf("[014] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
             $host, $user, $db, $port, $socket);
 
-    if (NULL !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
-        printf("[015] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+    if (true !== ($tmp = $link->connect($host, $user, $passwd, $db, $port, $socket)))
+        printf("[015] Expecting true got %s/%s\n", gettype($tmp), $tmp);
 
     print "done!";
 ?>