Merge branch '3.4' into 4.1
* 3.4: fixed tests
This commit is contained in:
commit
7aba5edcd0
@ -150,7 +150,7 @@ class InlineFragmentRendererTest extends TestCase
|
|||||||
$expectedSubRequest = Request::create('/');
|
$expectedSubRequest = Request::create('/');
|
||||||
$expectedSubRequest->attributes->set('_format', 'foo');
|
$expectedSubRequest->attributes->set('_format', 'foo');
|
||||||
$expectedSubRequest->setLocale('fr');
|
$expectedSubRequest->setLocale('fr');
|
||||||
if (Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP)) {
|
if (Request::HEADER_CLIENT_IP & Request::getTrustedHeaderSet()) {
|
||||||
$expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
|
$expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
|
||||||
$expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
|
$expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user