Merged
Conversation
Contributor
Author
|
Targetting 13, but can be merged to master too. |
rullzer
previously requested changes
Jan 12, 2018
Member
rullzer
left a comment
There was a problem hiding this comment.
can you also add tests for this?
| if ($protocol != "https") { | ||
| $xForwardedProto = $this->request->getHeader('HTTP_X_FORWARDED_PROTO'); | ||
| $xForwardedSSL = $this->request->getHeader('HTTP_X_FORWARDED_SSL'); | ||
| if (($xForwardedProto !== null && $xForwardedProto == "https") || |
| $xForwardedProto = $this->request->getHeader('HTTP_X_FORWARDED_PROTO'); | ||
| $xForwardedSSL = $this->request->getHeader('HTTP_X_FORWARDED_SSL'); | ||
| if (($xForwardedProto !== null && $xForwardedProto == "https") || | ||
| ($xForwardedSSL !== null && $xForwardedSSL == "on")) { |
Member
There was a problem hiding this comment.
Also why first test if it is null ;)
Contributor
Author
|
@rullzer done! |
Contributor
Author
|
Tests unlikely, but you can if I ask nicely?:) |
Contributor
Author
|
Of course, real testing also appreciated, since I can't test atm. |
Codecov Report
@@ Coverage Diff @@
## stable13 #7806 +/- ##
==============================================
+ Coverage 51.23% 51.23% +<.01%
- Complexity 24970 24973 +3
==============================================
Files 1607 1607
Lines 95008 95014 +6
Branches 1376 1376
==============================================
+ Hits 48675 48680 +5
- Misses 46333 46334 +1
|
Member
|
Added the tests |
63ca86e to
9be00f1
Compare
Member
Usually we do the one against master first and then backport to the stable branches. But let's do it the other way around here too. |
rullzer
approved these changes
Jan 13, 2018
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
MorrisJobke
approved these changes
Jan 14, 2018
This was referenced Jan 14, 2018
Merged
Closed
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 issue #7805 (or at least it should).
cc @rullzer @nickvergessen and @MorrisJobke because this breaks things for me :(
Signed-off-by: Mario Danic mario@lovelyhq.com