Merge pull request #3848 from daguiler/bugfix/DNN-40684

Revert "DNN-35719: page in redirect mode doesn't work under ssl offloading environment"
dnnsoftware · Jun 23, 2020 · be27402 · be27402
2 parents d88230f + f643730
commit be27402
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/DNN Platform/Library/Common/Utilities/UrlUtils.cs b/DNN Platform/Library/Common/Utilities/UrlUtils.cs
@@ -167,8 +167,7 @@ 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)
         {
-            var isSecureTab = PortalController.Instance.GetCurrentPortalSettings()?.ActiveTab.IsSecure ?? false;
-            return request.IsSecureConnection || (IsSslOffloadEnabled(request) && isSecureTab);
+            return request.IsSecureConnection || IsSslOffloadEnabled(request);
         }
 
         public static bool IsSslOffloadEnabled(HttpRequest request)