jenkins-bot has submitted this change and it was merged. Change subject: Fix HTTPS protocol detection ......................................................................
Fix HTTPS protocol detection According to PHP documentation: http://www.php.net/manual/en/reserved.variables.server.php The $_SERVER['HTTPS'] is set to a non-empty value if the script was queried through the HTTPS protocol. There is also note that for ISAPI with IIS, the value is set to 'off' if the request was not made through the HTTPS protocol. To follow the PHP documentation the $_SERVER['HTTPS'] == 'on' doesn't seem to be the correct way how to detect the HTTPS protocol (there maybe e.g. '1' instead of 'on'). Bug: 46511 Change-Id: I5675fed9b7d54711b96b25702181112ef3692f3c --- M includes/WebRequest.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Anomie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/WebRequest.php b/includes/WebRequest.php index e931f28..f86a454 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -207,9 +207,9 @@ * @return array */ public static function detectProtocol() { - if ( ( isset( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] == 'on' ) || + if ( ( !empty( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] !== 'off' ) || ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) && - $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) ) { + $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ) ) { return 'https'; } else { return 'http'; -- To view, visit https://gerrit.wikimedia.org/r/116943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5675fed9b7d54711b96b25702181112ef3692f3c Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Yarda <[email protected]> Gerrit-Reviewer: Anomie <[email protected]> Gerrit-Reviewer: Awjrichards <[email protected]> Gerrit-Reviewer: Daniel Friesen <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: Yarda <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
