[BrowserKit] Pass headers when followRedirect() is called

stloyd · stloyd · commit 0d07af896b9d · 2013-08-08T14:24:29.000+02:00
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -420,7 +420,7 @@ public function followRedirect()
             throw new \LogicException('The request was not redirected.');
         }
 
-        return $this->request('get', $this->redirect);
+        return $this->request('get', $this->redirect, array(), array(), $this->history->current()->getServer());
     }
 
     /**
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -342,6 +342,33 @@ public function testFollowRedirectWithCookies()
         $this->assertEquals(array('foo' => 'bar'), $client->getRequest()->getCookies());
     }
 
+    public function testFollowRedirectWithHeaders()
+    {
+        $headers = array(
+            'HTTP_HOST'       => 'www.example.com',
+            'HTTP_USER_AGENT' => 'Symfony2 BrowserKit',
+            'CONTENT_TYPE'    => 'application/vnd.custom+xml',
+            'HTTPS'           => false,
+        );
+
+        $client = new TestClient();
+        $client->followRedirects(false);
+        $client->setNextResponse(new Response('', 302, array(
+            'Location'    => 'http://www.example.com/redirected',
+        )));
+        $client->request('GET', 'http://www.example.com/', array(), array(), array(
+            'CONTENT_TYPE' => 'application/vnd.custom+xml',
+        ));
+
+        $this->assertEquals($headers, $client->getRequest()->getServer());
+
+        $client->followRedirect();
+
+        $headers['HTTP_REFERER'] = 'http://www.example.com/';
+
+        $this->assertEquals($headers, $client->getRequest()->getServer());
+    }
+
     public function testBack()
     {
         $client = new TestClient();

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ public function followRedirect()`
`420`	`420`	`throw new \LogicException('The request was not redirected.');`
`421`	`421`	`}`
`422`	`422`
`423`		`- return $this->request('get', $this->redirect);`
	`423`	`+ return $this->request('get', $this->redirect, array(), array(), $this->history->current()->getServer());`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`/**`