[BrowserKit] Fix bug when uri starts with http.
| Q | A | ------------- | --- | Fixed tickets | | License | MIT
This commit is contained in:
parent
cff69aa18b
commit
6d3ec633cd
@ -556,7 +556,7 @@ abstract class Client
|
|||||||
protected function getAbsoluteUri($uri)
|
protected function getAbsoluteUri($uri)
|
||||||
{
|
{
|
||||||
// already absolute?
|
// already absolute?
|
||||||
if (0 === strpos($uri, 'http')) {
|
if (0 === strpos($uri, 'http://') || 0 === strpos($uri, 'https://')) {
|
||||||
return $uri;
|
return $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -207,6 +207,21 @@ class ClientTest extends \PHPUnit_Framework_TestCase
|
|||||||
$client->request('GET', 'http://www.example.com/foo/foobar');
|
$client->request('GET', 'http://www.example.com/foo/foobar');
|
||||||
$client->request('GET', 'bar');
|
$client->request('GET', 'bar');
|
||||||
$this->assertEquals('http://www.example.com/foo/bar', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
|
$this->assertEquals('http://www.example.com/foo/bar', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
|
||||||
|
|
||||||
|
$client = new TestClient();
|
||||||
|
$client->request('GET', 'http://www.example.com/foo/');
|
||||||
|
$client->request('GET', 'http');
|
||||||
|
$this->assertEquals('http://www.example.com/foo/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
|
||||||
|
|
||||||
|
$client = new TestClient();
|
||||||
|
$client->request('GET', 'http://www.example.com/foo');
|
||||||
|
$client->request('GET', 'http/bar');
|
||||||
|
$this->assertEquals('http://www.example.com/http/bar', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
|
||||||
|
|
||||||
|
$client = new TestClient();
|
||||||
|
$client->request('GET', 'http://www.example.com/');
|
||||||
|
$client->request('GET', 'http');
|
||||||
|
$this->assertEquals('http://www.example.com/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testRequestURIConversionByServerHost()
|
public function testRequestURIConversionByServerHost()
|
||||||
|
Reference in New Issue
Block a user