[HttpFoundation] fix false-positive ConflictingHeadersException #28144
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
97d90e8 to
6089290
Compare
nicolas-grekas
commented
Aug 6, 2018
| // Remove port (unfortunately, it does happen) | ||
| if (preg_match('{((?:\d+\.){3}\d+)\:\d+}', $clientIp, $match)) { | ||
| $clientIps[$key] = $clientIp = $match[1]; | ||
| if (strpos($clientIp, '.')) { |
There was a problem hiding this comment.
this part of the patch is a bugfix backported from 4.1, needed by the fix line 1946 (brackets should not be removed from the value)
nicolas-grekas
commented
Aug 6, 2018
| @@ -967,7 +967,7 @@ public function testGetClientIpsWithAgreeingHeaders($httpForwarded, $httpXForwar | |||
| 'HTTP_X_FORWARDED_FOR' => $httpXForwardedFor, | |||
| ); | |||
|
|
|||
| Request::setTrustedProxies(array('88.88.88.88')); | |||
| Request::setTrustedProxies(array('88.88.88.88'), -1); | |||
There was a problem hiding this comment.
wrongly set to Request::HEADER_X_FORWARDED_ALL on 3.4+, this will act as a reminder by the conflict it will create when merging
|
I can confirm that this PR fixed https://jira.ez.no/browse/EZP-29497 on my local installation. |
nicolas-grekas
added a commit
that referenced
this pull request
Aug 8, 2018
…ption (nicolas-grekas) This PR was merged into the 2.8 branch. Discussion ---------- [HttpFoundation] fix false-positive ConflictingHeadersException | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28153 | License | MIT | Doc PR | - Fixes https://jira.ez.no/browse/EZP-29492 & https://jira.ez.no/browse/EZP-29497 Ping @andrerom Commits ------- 6089290 [HttpFoundation] fix false-positive ConflictingHeadersException
|
@fabpot @nicolas-grekas Can we get |
nicolas-grekas
referenced
this pull request
in symfony/http-kernel
Aug 26, 2018
* 3.4: [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
This was referenced Aug 27, 2018
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.
Fixes https://jira.ez.no/browse/EZP-29492 & https://jira.ez.no/browse/EZP-29497
Ping @andrerom