DNN-35719: page in redirect mode doesn't work under ssl offloading en…

…vironment. (dnnsoftware#3453)
daguiler · Jan 11, 2020 · 6e72329 · 6e72329
1 parent 3d420c4
commit 6e72329
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/DNN Platform/Library/Common/Utilities/UrlUtils.cs b/DNN Platform/Library/Common/Utilities/UrlUtils.cs
@@ -161,7 +161,8 @@ public static string[] GetQSParamsForNavigateURL()
         /// <returns>true if HTTPS or if HTTP with an SSL offload header value, false otherwise</returns>
         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)