From 39973de230a210410dbc86b40a89c089015c0a18 Mon Sep 17 00:00:00 2001
From: Walther Lalk <walther@octoplus.co.za>
Date: Wed, 30 Jul 2014 13:48:48 +0200
Subject: [PATCH] [BrowserKit] Fix browser kit redirect with ports

---
 src/Symfony/Component/BrowserKit/Client.php           | 2 +-
 src/Symfony/Component/BrowserKit/Tests/ClientTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index 6e91305a74..08979f65a3 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -607,7 +607,7 @@ abstract class Client
 
     private function updateServerFromUri($server, $uri)
     {
-        $server['HTTP_HOST'] = parse_url($uri, PHP_URL_HOST);
+        $server['HTTP_HOST'] = $this->extractHost($uri);
         $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']);
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
index cd37fcf76a..97205bf911 100644
--- a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
+++ b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -484,11 +484,11 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $headers = array(
             'HTTP_HOST'       => 'www.example.com:8080',
             'HTTP_USER_AGENT' => 'Symfony2 BrowserKit',
-            'HTTPS'           => false
+            'HTTPS'           => false,
+            'HTTP_REFERER'    => 'http://www.example.com:8080/'
         );
 
         $client = new TestClient();
-        $client->followRedirects(false);
         $client->setNextResponse(new Response('', 302, array(
             'Location'    => 'http://www.example.com:8080/redirected',
         )));