From 2067a6fe1da19e65517eb65c03dfeaa34f8a122b Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Tue, 7 Jun 2022 18:05:34 +0900
Subject: [PATCH] Config master SSL site detection update

---
 www/configs/config.master.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/configs/config.master.php b/www/configs/config.master.php
index 1897bb18..82abd0c9 100644
--- a/www/configs/config.master.php
+++ b/www/configs/config.master.php
@@ -232,10 +232,16 @@ if (
 	exit;
 }
 // set SSL on
-if (
-	(array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
-	$_SERVER['SERVER_PORT'] == 443
+$is_secure = false;
+if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+	$is_secure = true;
+} elseif (
+	!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ||
+	!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on'
 ) {
+	$is_secure = true;
+}
+if ($is_secure) {
 	define('HOST_SSL', true);
 	define('HOST_PROTOCOL', 'https://');
 } else {