mysqli won't accept empty string for socket, skip test of mysqli.default_socket if...

diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index 60f58fbf18aca07ac82bcebe7319676d6b974c56..899d353f4a04446c084142a77fbc2cb324f347c4 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -9,7 +9,11 @@ new mysqli()
 
        $tmp    = NULL;
        $link   = NULL;
-       ini_set('mysqli.default_socket', 'socket');
+
+       if ($socket != "")
+               /* mysqli.default_socket requires non-empty string */
+               ini_set('mysqli.default_socket', 'socket');
+
        ini_set('mysqli.default_port', 9999);
        ini_set('mysqli.default_pw', 'password');
        ini_set('mysqli.default_user', 'user');
@@ -18,21 +22,23 @@ new mysqli()
        mysqli_report(MYSQLI_REPORT_OFF);
        mysqli_report(MYSQLI_REPORT_STRICT);
 
-       ini_set('mysqli.default_socket', $socket);
-       try {
-               $mysqli = mysqli_init();
-               $mysqli->real_connect($host, $user, $passwd, $db, $port);
+       if ($socket != "") {
+               ini_set('mysqli.default_socket', $socket);
+               try {
+                       $mysqli = mysqli_init();
+                       $mysqli->real_connect($host, $user, $passwd, $db, $port);
 
-               if (!$res = $mysqli->query("SELECT 'mysqli.default_socket' AS testing"))
-                       printf("[001] [%d] %s\n", $mysqli->errno, $mysqli->error);
-               var_dump($res->fetch_assoc());
-               $res->free_result();
+                       if (!$res = $mysqli->query("SELECT 'mysqli.default_socket' AS testing"))
+                               printf("[001] [%d] %s\n", $mysqli->errno, $mysqli->error);
+                       var_dump($res->fetch_assoc());
+                       $res->free_result();
 
-               $mysqli->close();
+                       $mysqli->close();
 
-       } catch (mysqli_sql_exception $e) {
-               printf("%s\n", $e->getMessage());
-               printf("[002] Usage of mysqli.default_socket failed\n");
+               } catch (mysqli_sql_exception $e) {
+                       printf("%s\n", $e->getMessage());
+                       printf("[002] Usage of mysqli.default_socket failed\n");
+               }
        }
 
        ini_set('mysqli.default_port', $port);