[HttpFoundation] HttpCache refresh stale responses containing an ETag

Jonatan Männchen · maennchen · commit 96df6b984cdf · 2016-07-20T22:30:20.000Z
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -600,6 +600,9 @@ protected function lock(Request $request, Response $entry)
      */
     protected function store(Request $request, Response $response)
     {
+        if (!$response->headers->has('Date')) {
+            $response->setDate(\DateTime::createFromFormat('U', time()));
+        }
         try {
             $this->store->write($request, $response);
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -181,6 +181,31 @@ public function testRespondsWith304OnlyIfIfNoneMatchAndIfModifiedSinceBothMatch(
         $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) {

Original file line number	Diff line number	Diff line change
`@@ -600,6 +600,9 @@ protected function lock(Request $request, Response $entry)`
`600`	`600`	`*/`
`601`	`601`	`protected function store(Request $request, Response $response)`
`602`	`602`	`{`
	`603`	`+ if (!$response->headers->has('Date')) {`
	`604`	`+ $response->setDate(\DateTime::createFromFormat('U', time()));`
	`605`	`+ }`
`603`	`606`	`try {`
`604`	`607`	`$this->store->write($request, $response);`
`605`	`608`