Changeset 42229 for branches/4.9/tests/phpunit/tests/db.php

Timestamp:

11/27/2017 12:55:11 AM (9 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.
Merges [42226] to the 4.9 branch.
Fixes #42634 for 4.9.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/db.php (modified) (4 diffs)

branches/4.9/tests/phpunit/tests/db.php

@@ -1560 +1560 @@
                         ),
                         array(
+                                ':/tmp/mysql:with_colon.sock',
+                                false,
+                                '',
+                                null,
+                                '/tmp/mysql:with_colon.sock',
+                                false,
+                        ),
+                        array(
                                 '127.0.0.1',
                                 false,
@@ -1576 +1584 @@
                         ),
                         array(
+                                '127.0.0.1:3306:/tmp/mysql:with_colon.sock',
+                                false,
+                                '127.0.0.1',
+                                '3306',
+                                '/tmp/mysql:with_colon.sock',
+                                false,
+                        ),
+                        array(
                                 'example.com',
                                 false,
@@ -1608 +1624 @@
                         ),
                         array(
+                                'localhost:/tmp/mysql:with_colon.sock',
+                                false,
+                                'localhost',
+                                null,
+                                '/tmp/mysql:with_colon.sock',
+                                false,
+                        ),
+                        array(
                                 '0000:0000:0000:0000:0000:0000:0000:0001',
                                 false,
@@ -1640 +1664 @@
                         ),
                         array(
+                                '[::1]:3306:/tmp/mysql:with_colon.sock',
+                                false,
+                                '::1',
+                                '3306',
+                                '/tmp/mysql:with_colon.sock',
+                                true,
+                        ),
+                        array(
                                 '2001:0db8:0000:0000:0000:ff00:0042:8329',
                                 false,