This repository has been archived by the owner on Jan 29, 2020. It is now read-only.
Apply #363 (detection of HTTPS) on v1 (LTS) #364
Merged
Conversation
This file contains 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
This modifies the detection of HTTPS by checking whether the lower-case value of the HTTPS-key of the server variable equals 'on'. Before that checked whether the value did *not* match 'off' which meant that the nginx-default for non-HTTPS connections (which, according to the [documentation](http://nginx.org/en/docs/http/ngx_http_core_module.html#var_https) is an empty string) did in fact match and returned that the connection *is* encrypted. This fixes #362 # Conflicts: # src/functions/marshal_uri_from_sapi.php
This adds the test and the CHANGELOG-entry for the changed method # Conflicts: # CHANGELOG.md
This modifies the copyright-date, adds some spaces before and after the arrow, replaces double quotes with single quotes and modifies a function docBlock.
It is not possible that header value will be true for HTTPS. It is `on`/`On`/`ON` when it's enabled, and `off` (apache) or empty string (nginx) otherwise.
|
@webimpress, @heiglandreas thank you |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
As zend-diactoros v1 is still LTS we should provide the hotfix also in that branch.
I've ported @heiglandreas commits with changes to work on v1.
masterbranch, and submit against that branch.CHANGELOG.mdentry for the fix./cc @heiglandreas @weierophinney