bug #10649 [BrowserKit] Fix #10641 : BrowserKit is broken when using ip as host (romainneutron)

fabpot · fabpot · commit 9a95f520c9ae · 2014-04-09T05:10:38.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [BrowserKit] Fix #10641 : BrowserKit is broken when using ip as host | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #10641 | License | MIT As documented in http://php.net/manual/en/function.preg-replace.php, we have to use the `$` notation for replacing the backreference >When working with a replacement pattern where a backreference is immediately followed by another number (i.e.: placing a literal number immediately after a matched pattern), you cannot use the familiar \\1 notation for your backreference. \\11, for example, would confuse preg_replace() since it does not know whether you want the \\1 backreference followed by a literal 1, or the \\11 backreference followed by nothing. In this case the solution is to use \${1}1. This creates an isolated $1 backreference, leaving the 1 as a literal. Commits ------- e946da3 [BrowserKit] Fix #10641 : BrowserKit is broken when using ip as host
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -304,7 +304,7 @@ public function request($method, $uri, array $parameters = array(), array $files
         $uri = $this->getAbsoluteUri($uri);
 
         if (isset($server['HTTP_HOST'])) {
-            $uri = preg_replace('{^(https?\://)'.parse_url($uri, PHP_URL_HOST).'}', '\\1'.$server['HTTP_HOST'], $uri);
+            $uri = preg_replace('{^(https?\://)'.parse_url($uri, PHP_URL_HOST).'}', '${1}'.$server['HTTP_HOST'], $uri);
         }
 
         if (isset($server['HTTPS'])) {
diff --git a/src/Symfony/Component/BrowserKit/Tests/ClientTest.php b/src/Symfony/Component/BrowserKit/Tests/ClientTest.php
@@ -103,6 +103,14 @@ public function testGetRequest()
         $this->assertEquals('http://example.com/', $client->getRequest()->getUri(), '->getCrawler() returns the Request of the last request');
     }
 
+    public function testGetRequestWithIpAsHost()
+    {
+        $client = new TestClient();
+        $client->request('GET', 'https://example.com/foo', array(), array(), array('HTTP_HOST' => '127.0.0.1'));
+
+        $this->assertEquals('https://127.0.0.1/foo', $client->getRequest()->getUri());
+    }
+
     public function testGetResponse()
     {
         $client = new TestClient();

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ public function request($method, $uri, array $parameters = array(), array $files`
`304`	`304`	`$uri = $this->getAbsoluteUri($uri);`
`305`	`305`
`306`	`306`	`if (isset($server['HTTP_HOST'])) {`
`307`		`- $uri = preg_replace('{^(https?\://)'.parse_url($uri, PHP_URL_HOST).'}', '\\1'.$server['HTTP_HOST'], $uri);`
	`307`	`+ $uri = preg_replace('{^(https?\://)'.parse_url($uri, PHP_URL_HOST).'}', '${1}'.$server['HTTP_HOST'], $uri);`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`if (isset($server['HTTPS'])) {`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,14 @@ public function testGetRequest()`
`103`	`103`	`$this->assertEquals('http://example.com/', $client->getRequest()->getUri(), '->getCrawler() returns the Request of the last request');`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ public function testGetRequestWithIpAsHost()`
	`107`	`+ {`
	`108`	`+ $client = new TestClient();`
	`109`	`+ $client->request('GET', 'https://example.com/foo', array(), array(), array('HTTP_HOST' => '127.0.0.1'));`
	`110`	`+`
	`111`	`+ $this->assertEquals('https://127.0.0.1/foo', $client->getRequest()->getUri());`
	`112`	`+ }`
	`113`	`+`
`106`	`114`	`public function testGetResponse()`
`107`	`115`	`{`
`108`	`116`	`$client = new TestClient();`