Changeset 38429

Timestamp:

08/29/2016 02:32:48 AM (8 years ago)

Author:

dd32

Message:

HTTP: Handle an edgecase within the URI parsing library included in Requests, where if a double slash exists at the start of the path the URL is passed to cURL malformed.

Props flixos90 for initial patch.
Fixes #37733 for trunk.

Location:

trunk

Files:

• src/wp-includes/class-http.php (modified) (1 diff)
• tests/phpunit/tests/http/base.php (modified) (1 diff)

trunk/src/wp-includes/class-http.php

@@ -363 +363 @@
         }
 
+        // Work around a bug in Requests when the path starts with // See https://github.com/rmccue/Requests/issues/231
+        $url = preg_replace( '!^(\w+://[^/]+)//(.*)$!i', '$1/$2', $url );
+
         try {
             $requests_response = Requests::request( $url, $headers, $data, $type, $options );

trunk/tests/phpunit/tests/http/base.php

@@ -377 +377 @@
     }
 
+    /**
+     * @ticket 37733
+     */
+    function test_url_with_double_slashes_path() {
+        $url = $this->redirection_script . '?rt=' . 0;
+
+        $path = parse_url( $url, PHP_URL_PATH );
+        $url = str_replace( $path, '/' . $path, $url );
+
+        $res = wp_remote_request( $url );
+        $this->assertNotWPError( $res );
+    }
+
 
 }