fixed protocol-relative URLs

symfony · Mar 27, 2014 · d744878 · d744878
1 parent 2a14639
commit d744878
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Client.php b/Client.php
@@ -613,7 +613,8 @@ protected function requestFromRequest(Request $request, $changeHistory = true)
     private function updateServerFromUri($server, $uri)
     {
         $server['HTTP_HOST'] = parse_url($uri, PHP_URL_HOST);
-        $server['HTTPS'] = 'https' == parse_url($uri, PHP_URL_SCHEME);
+        $scheme = parse_url($uri, PHP_URL_SCHEME);
+        $server['HTTPS'] = null === $scheme ? $server['HTTPS'] : 'https' == $scheme;
         unset($server['HTTP_IF_NONE_MATCH'], $server['HTTP_IF_MODIFIED_SINCE']);
 
         return $server;

diff --git a/Tests/ClientTest.php b/Tests/ClientTest.php
@@ -399,7 +399,7 @@ public function testFollowRedirectWithMaxRedirects()
         $this->assertEquals('http://www.example.com/redirected', $client->getRequest()->getUri(), '->followRedirect() follows relative URLs');
 
         $client = new TestClient();
-        $client->setNextResponse(new Response('', 302, array('Location' => 'https://www.example.org/')));
+        $client->setNextResponse(new Response('', 302, array('Location' => '//www.example.org/')));
         $client->request('GET', 'https://www.example.com/');
 
         $this->assertEquals('https://www.example.org/', $client->getRequest()->getUri(), '->followRedirect() follows protocol-relative URLs');