Ticket #32798: wp-db.php.patch

src/wp-includes/wp-db.php

@@ -1414 +1414 @@
                  * Deprecated in 3.9+ when using MySQLi. No equivalent
                  * $new_link parameter exists for mysqli_* functions.
                  */
                 $new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true;
                 $client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0;
+                $port = null;
+                $socket = null;
+                $host = $this->dbhost;
+                $port_or_socket = strstr( $host, ':' );
 
                 if ( $this->use_mysqli ) {
                         $this->dbh = mysqli_init();
 
                         // mysqli_real_connect doesn't support the host param including a port or socket
                         // like mysql_connect does. This duplicates how mysql_connect detects a port and/or socket file.
-                        $port = null;
-                        $socket = null;
-                        $host = $this->dbhost;
-                        $port_or_socket = strstr( $host, ':' );
                         if ( ! empty( $port_or_socket ) ) {
                                 $host = substr( $host, 0, strpos( $host, ':' ) );
                                 $port_or_socket = substr( $port_or_socket, 1 );
-                                if ( 0 !== strpos( $port_or_socket, '/' ) ) {
-                                        $port = intval( $port_or_socket );
-                                        $maybe_socket = strstr( $port_or_socket, ':' );
-                                        if ( ! empty( $maybe_socket ) ) {
-                                                $socket = substr( $maybe_socket, 1 );
-                                        }
-                                } else {
-                                        $socket = $port_or_socket;
+                                switch(0)
+                                {
+                                        case strpos( $port_or_socket, '/' ): # linux socket
+                                        case strpos( $port_or_socket, '\\'): # windows pipe
+                                                $socket = $port_or_socket;
+                                                break;
+                                        default:
+                                                $port = intval( $port_or_socket );
+                                                $maybe_socket = strstr( $port_or_socket, ':' );
+                                                if ( ! empty( $maybe_socket ) ) {
+                                                        $socket = substr( $maybe_socket, 1 );
+                                                }
                                 }
                         }
 
                         if ( WP_DEBUG ) {
                                 mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags );
@@ -1468 +1472 @@
                                         $this->use_mysqli = false;
                                         $this->db_connect();
                                 }
                         }
                 } else {
+                        if ( ! empty( $port_or_socket ) ) {
+                                $host = substr( $host, 0, strpos( $host, ':' ) );
+                                $port_or_socket = substr( $port_or_socket, 1 );
+                                if( 0===strpos( $port_or_socket, '\\' )) # windows pipe
+                                {
+                                        ini_set('mysql.default_host', $host);
+                                        ini_set('mysql.default_socket', $port_or_socket);
+                                }
+                        }
+                        
                         if ( WP_DEBUG ) {
                                 $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
                         } else {
                                 $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
                         }