From 6e72329071734d950e3868e0b4c62fa14bb34372 Mon Sep 17 00:00:00 2001 From: Ben Date: Sat, 11 Jan 2020 21:00:37 +0800 Subject: [PATCH] DNN-35719: page in redirect mode doesn't work under ssl offloading environment. (#3453) --- DNN Platform/Library/Common/Utilities/UrlUtils.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DNN Platform/Library/Common/Utilities/UrlUtils.cs b/DNN Platform/Library/Common/Utilities/UrlUtils.cs index 6c0df0ef48b..109a3eaa735 100644 --- a/DNN Platform/Library/Common/Utilities/UrlUtils.cs +++ b/DNN Platform/Library/Common/Utilities/UrlUtils.cs @@ -161,7 +161,8 @@ public static string[] GetQSParamsForNavigateURL() /// true if HTTPS or if HTTP with an SSL offload header value, false otherwise public static bool IsSecureConnectionOrSslOffload(HttpRequest request) { - return request.IsSecureConnection || IsSslOffloadEnabled(request); + var isSecureTab = PortalController.Instance.GetCurrentPortalSettings()?.ActiveTab.IsSecure ?? false; + return request.IsSecureConnection || (IsSslOffloadEnabled(request) && isSecureTab); } public static bool IsSslOffloadEnabled(HttpRequest request)