Avoid empty \"If-Modified-Since\" header in validation request

mpdude · stof · commit 960faef66f48 · 2019-11-23T16:07:54.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -352,7 +352,9 @@ protected function validate(Request $request, Response $entry, $catch = false)
         }
 
         // add our cached last-modified validator
-        $subRequest->headers->set('if_modified_since', $entry->headers->get('Last-Modified'));
+        if ($entry->headers->has('Last-Modified')) {
+            $subRequest->headers->set('if_modified_since', $entry->headers->get('Last-Modified'));
+        }
 
         // Add our cached etag validator to the environment.
         // We keep the etags from the client to handle the case when the client
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
@@ -859,6 +859,7 @@ public function testValidatesCachedResponsesUseSameHttpMethod()
     public function testValidatesCachedResponsesWithETagAndNoFreshnessInformation()
     {
         $this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
+            $this->assertFalse($request->headers->has('If-Modified-Since'));
             $response->headers->set('Cache-Control', 'public');
             $response->headers->set('ETag', '"12345"');
             if ($response->getETag() == $request->headers->get('IF_NONE_MATCH')) {

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,9 @@ protected function validate(Request $request, Response $entry, $catch = false)`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`// add our cached last-modified validator`
`355`		`- $subRequest->headers->set('if_modified_since', $entry->headers->get('Last-Modified'));`
	`355`	`+ if ($entry->headers->has('Last-Modified')) {`
	`356`	`+ $subRequest->headers->set('if_modified_since', $entry->headers->get('Last-Modified'));`
	`357`	`+ }`
`356`	`358`
`357`	`359`	`// Add our cached etag validator to the environment.`
`358`	`360`	`// We keep the etags from the client to handle the case when the client`
Original file line number	Diff line number	Diff line change
`@@ -859,6 +859,7 @@ public function testValidatesCachedResponsesUseSameHttpMethod()`
`859`	`859`	`public function testValidatesCachedResponsesWithETagAndNoFreshnessInformation()`
`860`	`860`	`{`
`861`	`861`	`$this->setNextResponse(200, [], 'Hello World', function ($request, $response) {`
	`862`	`+ $this->assertFalse($request->headers->has('If-Modified-Since'));`
`862`	`863`	`$response->headers->set('Cache-Control', 'public');`
`863`	`864`	`$response->headers->set('ETag', '"12345"');`
`864`	`865`	`if ($response->getETag() == $request->headers->get('IF_NONE_MATCH')) {`