From aef2981e05306f17009f45efd554c24a3415ab16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Sat, 24 Aug 2013 22:29:19 +0200 Subject: [PATCH] Update Tools.php Former-commit-id: 688376241f5ab5083ed178ad3979ceebad2b9cbb --- Core/Frameworks/Flake/Util/Tools.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Core/Frameworks/Flake/Util/Tools.php b/Core/Frameworks/Flake/Util/Tools.php index 81c4aac..7832f70 100644 --- a/Core/Frameworks/Flake/Util/Tools.php +++ b/Core/Frameworks/Flake/Util/Tools.php @@ -45,6 +45,10 @@ class Tools extends \Flake\Core\FLObject { } public static function getCurrentProtocol() { + if(isset($GLOBALS['_SERVER']['HTTP_X_FORWARDED_PROTO']) && !empty($GLOBALS['_SERVER']['HTTP_X_FORWARDED_PROTO'])) { + return $GLOBALS['_SERVER']['HTTP_X_FORWARDED_PROTO']; + } + if((!empty($GLOBALS["_SERVER"]["HTTPS"]) && $GLOBALS["_SERVER"]['HTTPS'] !== 'off') || intval($_SERVER['SERVER_PORT']) === 443) { return "https"; } @@ -761,4 +765,4 @@ TEST; } return $data; } -} \ No newline at end of file +}