[BrowserKit] fixed headers when redirecting if history is set to false (refs symfony#8697)

fabpot · fabpot · commit 96a4b00c7c5e · 2013-08-30T20:37:05.000+02:00
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -40,6 +40,8 @@ abstract class Client
     protected $redirect;
     protected $followRedirects;
 
+    private $internalRequest;
+
     /**
      * Constructor.
      *
@@ -250,7 +252,7 @@ public function request($method, $uri, array $parameters = array(), array $files
         $server['HTTP_HOST'] = parse_url($uri, PHP_URL_HOST);
         $server['HTTPS'] = 'https' == parse_url($uri, PHP_URL_SCHEME);
 
-        $request = new Request($uri, $method, $parameters, $files, $this->cookieJar->allValues($uri), $server, $content);
+        $this->internalRequest = $request = new Request($uri, $method, $parameters, $files, $this->cookieJar->allValues($uri), $server, $content);
 
         $this->request = $this->filterRequest($request);
 
@@ -420,7 +422,9 @@ public function followRedirect()
             throw new \LogicException('The request was not redirected.');
         }
 
-        return $this->request('get', $this->redirect, array(), array(), $this->history->current()->getServer());
+        $server = $this->internalRequest->getServer();
+
+        return $this->request('get', $this->redirect, array(), array(), $server);
     }
 
     /**
