Support protocol relative URL in HTTP Client.

Some servers set //example.com as a Location header. `buildUrl()` needs to support that in order to build absolute urls.
cakephp · Sep 7, 2017 · 1feffe8 · 1feffe8
1 parent 6d25953
commit 1feffe8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/Http/Client.php b/src/Http/Client.php
@@ -448,15 +448,20 @@ public function buildUrl($url, $query = [], $options = [])
             $url .= $q;
             $url .= is_string($query) ? $query : http_build_query($query);
         }
-        if (preg_match('#^https?://#', $url)) {
-            return $url;
-        }
         $defaults = [
             'host' => null,
             'port' => null,
             'scheme' => 'http',
         ];
         $options += $defaults;
+
+        if (preg_match('#^//#', $url)) {
+            $url = $options['scheme'] . ':' . $url;
+        }
+        if (preg_match('#^https?://#', $url)) {
+            return $url;
+        }
+
         $defaultPorts = [
             'http' => 80,
             'https' => 443

diff --git a/tests/TestCase/Http/ClientTest.php b/tests/TestCase/Http/ClientTest.php
@@ -137,6 +137,15 @@ public static function urlProvider()
                 [],
                 'query string data with some already on the url.'
             ],
+            [
+                'http://example.com/test.html',
+                '//example.com/test.html',
+                [],
+                [
+                    'scheme' => 'http'
+                ],
+                'url without a scheme',
+            ],
         ];
     }