Changeset 42226 for trunk/src/wp-includes/wp-db.php

Timestamp:

11/24/2017 05:51:31 AM (7 years ago)

Author:

dd32

Message:

WPDB: Fix the parsing of sockets which contain colons within the socket name (used on some cloud providers).

Props natacado.
Fixes #42634 for trunk.

File:

• trunk/src/wp-includes/wp-db.php (modified) (2 diffs)

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

@@ -1644 +1644 @@
         $is_ipv6 = false;
 
+        // First peel off the socket parameter from the right, if it exists.
+        $socket_pos = strpos( $host, ':/' );
+        if ( $socket_pos !== false ) {
+            $socket = substr( $host, $socket_pos + 1 );
+            $host = substr( $host, 0, $socket_pos );
+        }
+
         // We need to check for an IPv6 address first.
         // An IPv6 address will always contain at least two colons.
         if ( substr_count( $host, ':' ) > 1 ) {
-            $pattern = '#^(?:\[)?(?<host>[0-9a-fA-F:]+)(?:\]:(?<port>[\d]+))?(?:/(?<socket>.+))?#';
+            $pattern = '#^(?:\[)?(?<host>[0-9a-fA-F:]+)(?:\]:(?<port>[\d]+))?#';
             $is_ipv6 = true;
         } else {
             // We seem to be dealing with an IPv4 address.
-            $pattern = '#^(?<host>[^:/]*)(?::(?<port>[\d]+))?(?::(?<socket>.+))?#';
+            $pattern = '#^(?<host>[^:/]*)(?::(?<port>[\d]+))?#';
         }
 
@@ -1663 +1670 @@
 
         $host = '';
-        foreach ( array( 'host', 'port', 'socket' ) as $component ) {
+        foreach ( array( 'host', 'port' ) as $component ) {
             if ( ! empty( $matches[ $component ] ) ) {
                 $$component = $matches[ $component ];