[HttpFoundation] HttpCache refresh stale responses containing an ETag

This commit is contained in:
Jonatan Männchen 2016-07-20 17:11:46 +00:00 committed by Jonatan Männchen
parent 37cd583e78
commit 96df6b984c
2 changed files with 28 additions and 0 deletions

View File

@ -600,6 +600,9 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
*/
protected function store(Request $request, Response $response)
{
if (!$response->headers->has('Date')) {
$response->setDate(\DateTime::createFromFormat('U', time()));
}
try {
$this->store->write($request, $response);

View File

@ -181,6 +181,31 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertEquals(304, $this->response->getStatusCode());
}
public function testIncrementsMaxAgeWhenNoDateIsSpecifiedEventWhenUsingETag()
{
$this->setNextResponse(
200,
array(
'ETag' => '1234',
'Cache-Control' => 'public, s-maxage=60',
)
);
$this->request('GET', '/');
$this->assertHttpKernelIsCalled();
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertTraceContains('miss');
$this->assertTraceContains('store');
sleep(2);
$this->request('GET', '/');
$this->assertHttpKernelIsNotCalled();
$this->assertEquals(200, $this->response->getStatusCode());
$this->assertTraceContains('fresh');
$this->assertEquals(2, $this->response->headers->get('Age'));
}
public function testValidatesPrivateResponsesCachedOnTheClient()
{
$this->setNextResponse(200, array(), '', function ($request, $response) {