[HttpKernel] Fix HttpCache validation HTTP method #19651
Merged
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
b0bc337 to
dff250f
Compare
|
👍 |
| @@ -374,7 +374,11 @@ protected function validate(Request $request, Response $entry, $catch = false) | |||
| $subRequest = clone $request; | |||
|
|
|||
| // send no head requests because we want content | |||
| $subRequest->setMethod('GET'); | |||
| if ($request->isMethodSafe() && $request->getMethod() !== 'HEAD') { | |||
| $subRequest->setMethod($request->getMethod()); | |||
There was a problem hiding this comment.
Is this needed. By default, the subrequest is going to have the same method as the main one.
There was a problem hiding this comment.
Indeed, I updated this.
dff250f to
6262cfb
Compare
| @@ -374,7 +374,9 @@ protected function validate(Request $request, Response $entry, $catch = false) | |||
| $subRequest = clone $request; | |||
|
|
|||
| // send no head requests because we want content | |||
| $subRequest->setMethod('GET'); | |||
| if (!$request->isMethodSafe() || $request->getMethod() === 'HEAD') { | |||
There was a problem hiding this comment.
I'm pretty sure that isMethodSafe() here will always return true. If not, we would not lookup anything in the cache in the first place. So, this part of the condition can be removed.
6262cfb to
3917900
Compare
3917900 to
1a8a8af
Compare
|
Thank you @tgalopin. |
fabpot
added a commit
that referenced
this pull request
Aug 17, 2016
This PR was merged into the 2.7 branch. Discussion ---------- [HttpKernel] Fix HttpCache validation HTTP method | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19582 | License | MIT | Doc PR | - Commits ------- 1a8a8af [HttpKernel] Fix HttpCache validation HTTP method
This was referenced Sep 2, 2016
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.
Uh oh!
There was an error while loading. Please reload this page.