[HttpKernel] Correctly merge max-age/s-maxage and Expires headers
#58376
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aschempp
commented
Sep 24, 2024
| @@ -371,7 +429,7 @@ public static function cacheControlMergingProvider() | |||
| ]; | |||
|
|
|||
| yield 'merge max-age and s-maxage' => [ | |||
| ['public' => true, 'max-age' => '60'], | |||
| ['public' => true, 'max-age' => null, 's-maxage' => '60'], | |||
There was a problem hiding this comment.
If one response has max-age and the other has s-maxage, the final response should only have a s-maxage header and no max-age (since we don't know the "private" value for one of the responses).
|
BTW this will cause upstream merge issues because the |
|
Failing test is unrelated (5.4 branch is failing without this PR as well) |
Toflar
approved these changes
Sep 25, 2024
chalasr
approved these changes
Sep 25, 2024
max-age/s-maxage and Expires headers
nicolas-grekas
approved these changes
Sep 28, 2024
mtarld
approved these changes
Oct 1, 2024
e6aec6b to
d3e65d6
Compare
|
Thank you @aschempp. |
|
Thank you Andreas |
This was referenced Oct 27, 2024
Merged
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
ResponseCacheStrategydoes not currently mergeExpiresandCache-Control: max-age/s-maxageheaders. Before #41665 this was not an issue, because if not all respones had all headers, they were not added to the final reponse. And we could assume a response itself is consistent betweenExpiresandmax-age.@mpdude added heuristic caching of public responses in #41665. Unfortunately, it only looks at
Cache-Control: publicbut if should also check if no cache information (max-age/s-maxage/Expires) is present. If that were the case, the behavior would not have changed. But it now leads to inconsistent header values because it independently keepsExpiresandmax-age/s-maxage.This PR does not only fix the heuristic caching, but also merges
ExpiresandCache-Controlheaders to make sure only the lowest value is retained across all headers. For semi-BC reasons I also made sure to only add anExpiresheader if any of the responses contains one.