symfony
diff --git a/‎src/Symfony/Component/BrowserKit/Client.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Client.php
+7-1Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/BrowserKit/Client.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Client.php
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/Symfony/Component/BrowserKit/Tests/ClientTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Tests/ClientTest.php
+19-2Lines changed: 19 additions & 2 deletions b/‎src/Symfony/Component/BrowserKit/Tests/ClientTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Tests/ClientTest.php
+19-2Lines changed: 19 additions & 2 deletions
@@ -259,11 +259,17 @@ public function request($method, $uri, array $parameters = array(), array $files
             ++$this->redirectCount;
         }
 
+        $originalUri = $uri;
+
         $uri = $this->getAbsoluteUri($uri);
 
         $server = array_merge($this->server, $server);
 
-        if (isset($server['HTTPS'])) {
+        if (!empty($server['HTTP_HOST']) && parse_url($originalUri, PHP_URL_HOST) === null) {
+            $uri = preg_replace('{^(https?\://)'.preg_quote($this->extractHost($uri)).'}', '${1}'.$server['HTTP_HOST'], $uri);
+        }
+
+        if (isset($server['HTTPS']) && parse_url($originalUri, PHP_URL_SCHEME) === null) {
             $uri = preg_replace('{^'.parse_url($uri, PHP_URL_SCHEME).'}', $server['HTTPS'] ? 'https' : 'http', $uri);
         }
 
 
@@ -622,7 +622,7 @@ public function testSetServerParameterInRequest()
         $this->assertEquals('', $client->getServerParameter('HTTP_HOST'));
         $this->assertEquals('Symfony2 BrowserKit', $client->getServerParameter('HTTP_USER_AGENT'));
 
-        $this->assertEquals('http://www.example.com/https/www.example.com', $client->getRequest()->getUri());
+        $this->assertEquals('https://www.example.com/https/www.example.com', $client->getRequest()->getUri());
 
         $server = $client->getRequest()->getServer();
 
@@ -636,7 +636,24 @@ public function testSetServerParameterInRequest()
         $this->assertEquals('new-server-key-value', $server['NEW_SERVER_KEY']);
 
         $this->assertArrayHasKey('HTTPS', $server);
-        $this->assertFalse($server['HTTPS']);
+        $this->assertTrue($server['HTTPS']);
+    }
+
+    public function testRequestWithRelativeUri()
+    {
+        $client = new TestClient();
+
+        $client->request('GET', '/', array(), array(), array(
+            'HTTP_HOST' => 'testhost',
+            'HTTPS' => true
+        ));
+        $this->assertEquals('https://testhost/', $client->getRequest()->getUri());
+
+        $client->request('GET', 'https://www.example.com/', array(), array(), array(
+            'HTTP_HOST' => 'testhost',
+            'HTTPS' => false
+        ));
+        $this->assertEquals('https://www.example.com/', $client->getRequest()->getUri());
     }
 
     public function testInternalRequest()