From 05de9cefbe64e88bb116dc6e2acb50a4f1cbf3b8 Mon Sep 17 00:00:00 2001 From: Josh Hall Date: Thu, 14 Nov 2019 10:53:23 -0600 Subject: [PATCH] Broaden HTTPS Check Because: - It is common for end users to use ports other than 443 for HTTPS - Mature systems, like IBM i, like to uppercase values --- src/Helper/ServerUrl.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Helper/ServerUrl.php b/src/Helper/ServerUrl.php index 56cb09808..a1d63d29e 100644 --- a/src/Helper/ServerUrl.php +++ b/src/Helper/ServerUrl.php @@ -144,9 +144,8 @@ protected function detectScheme() } switch (true) { - case (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] === true)): - case (isset($_SERVER['HTTP_SCHEME']) && ($_SERVER['HTTP_SCHEME'] == 'https')): - case (443 === $this->getPort()): + case (isset($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) == 'on' || $_SERVER['HTTPS'] === true)): + case (isset($_SERVER['HTTP_SCHEME']) && (strtolower($_SERVER['HTTP_SCHEME']) == 'https')): case $this->isReversedProxy(): $scheme = 'https'; break;