Consider response not cacheable when the master response is not cacheable

mpdude · mpdude · commit e5a131b9650a · 2018-03-22T21:19:59.000+01:00
This just adds the same logic to the master response that is applied
for embedded responses in the ResponseCacheStrategy::add() method.

This is sufficient to fix the current bug without causing regressions
(in terms of available tests).

Note that is probably too strict when it comes to merging private
responses: The Response::isCacheable() method deals with cacheability
in shared (surrogate) caches, whereas ResponseCacheStrategy is about
merging multiple responses together during ESI/SSI processing.
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
@@ -72,7 +72,7 @@ public function update(Response $response)
             $response->setLastModified(null);
         }
 
-        if (!$response->isFresh()) {
+        if (!$response->isFresh() || !$response->isCacheable()) {
             $this->cacheable = false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function update(Response $response)`
`72`	`72`	`$response->setLastModified(null);`
`73`	`73`	`}`
`74`	`74`
`75`		`- if (!$response->isFresh()) {`
	`75`	`+ if (!$response->isFresh() \|\| !$response->isCacheable()) {`
`76`	`76`	`$this->cacheable = false;`
`77`	`77`	`}`
`78`	`78`