Changeset 41820

Timestamp:

10/11/2017 12:09:47 AM (8 years ago)

Author:

pento

Message:

Database: When parsing the host, leave the port and socket as null if they're not defined.

This fixes a change in behaviour introduced by [41629].

The host is set to an empty string when it isn't defined, this continues existing behaviour. In particular, the mysqli library treats a null host as being the same as localhost, which is not always the intended behaviour.

Props birgire, markjaquith, pento.
Fixes #41722.

Location:

trunk

Files:

• src/wp-includes/wp-db.php (modified) (2 diffs)
• tests/phpunit/tests/db.php (modified) (4 diffs)

trunk/src/wp-includes/wp-db.php

@@ -1480 +1480 @@
             $socket  = null;
             $is_ipv6 = false;
-            
+
             if ( $host_data = $this->parse_db_host( $this->dbhost ) ) {
                 list( $host, $port, $socket, $is_ipv6 ) = $host_data;
@@ -1622 +1622 @@
         }
 
+        $host = '';
         foreach ( array( 'host', 'port', 'socket' ) as $component ) {
-            if ( array_key_exists( $component, $matches ) ) {
-                $$component = $matches[$component];
+            if ( ! empty( $matches[ $component ] ) ) {
+                $$component = $matches[ $component ];
             }
         }

trunk/tests/phpunit/tests/db.php

@@ -1209 +1209 @@
             list( $parsed_host, $parsed_port, $parsed_socket, $parsed_is_ipv6 ) = $data;
 
-            $this->assertEquals( $host, $parsed_host );
-            $this->assertEquals( $port, $parsed_port );
-            $this->assertEquals( $socket, $parsed_socket );
-            $this->assertEquals( $is_ipv6, $parsed_is_ipv6 );
+            $this->assertSame( $host, $parsed_host );
+            $this->assertSame( $port, $parsed_port );
+            $this->assertSame( $socket, $parsed_socket );
+            $this->assertSame( $is_ipv6, $parsed_is_ipv6 );
         }
     }
@@ -1221 +1221 @@
                 '',    // DB_HOST
                 false, // Expect parse_db_host to bail for this hostname
-                null,  // Parsed host
+                '',    // Parsed host
                 null,  // Parsed port
                 null,  // Parsed socket
@@ -1229 +1229 @@
                 ':3306',
                 false,
-                null,
+                '',
                 '3306',
                 null,
@@ -1237 +1237 @@
                 ':/tmp/mysql.sock',
                 false,
-                null,
+                '',
                 null,
                 '/tmp/mysql.sock',