[HttpKernel] fixed internal subrequests having an if-modified-since-header
This commit is contained in:
parent
0259bedec1
commit
e90038c52e
@ -129,6 +129,8 @@ class InlineFragmentRenderer extends RoutableFragmentRenderer
|
|||||||
}
|
}
|
||||||
|
|
||||||
$server['REMOTE_ADDR'] = '127.0.0.1';
|
$server['REMOTE_ADDR'] = '127.0.0.1';
|
||||||
|
unset($server['HTTP_IF_MODIFIED_SINCE']);
|
||||||
|
unset($server['HTTP_IF_NONE_MATCH']);
|
||||||
|
|
||||||
$subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server);
|
$subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server);
|
||||||
if ($request->headers->has('Surrogate-Capability')) {
|
if ($request->headers->has('Surrogate-Capability')) {
|
||||||
|
@ -197,6 +197,19 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, $trustedHeaderName);
|
Request::setTrustedHeaderName(Request::HEADER_CLIENT_IP, $trustedHeaderName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testHeadersPossiblyResultingIn304AreNotAssignedToSubrequest()
|
||||||
|
{
|
||||||
|
$expectedSubRequest = Request::create('/');
|
||||||
|
if (Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP)) {
|
||||||
|
$expectedSubRequest->headers->set('x-forwarded-for', array('127.0.0.1'));
|
||||||
|
$expectedSubRequest->server->set('HTTP_X_FORWARDED_FOR', '127.0.0.1');
|
||||||
|
}
|
||||||
|
|
||||||
|
$strategy = new InlineFragmentRenderer($this->getKernelExpectingRequest($expectedSubRequest));
|
||||||
|
$request = Request::create('/', 'GET', array(), array(), array(), array('HTTP_IF_MODIFIED_SINCE' => 'Fri, 01 Jan 2016 00:00:00 GMT', 'HTTP_IF_NONE_MATCH' => '*'));
|
||||||
|
$strategy->render('/', $request);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class Bar
|
class Bar
|
||||||
|
Reference in New Issue
Block a user