From 393727db8c5709c02af6a90531bfa81ebe3c4815 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Thu, 20 Mar 2014 22:30:23 +0100 Subject: [PATCH] Fixed: No longer listening on the https port when ssl is disabled. --- src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs b/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs index 48b8c0209..fd2557e02 100644 --- a/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs +++ b/src/NzbDrone.Host/AccessControl/UrlAclAdapter.cs @@ -43,15 +43,20 @@ namespace NzbDrone.Host.AccessControl var localHttpsUrls = BuildUrls("https", "localhost", _configFileProvider.SslPort); var wildcardHttpsUrls = BuildUrls("https", "*", _configFileProvider.SslPort); + if (!_configFileProvider.EnableSsl) + { + localHttpsUrls.Clear(); + wildcardHttpsUrls.Clear(); + } + if (OsInfo.IsWindows && !_runtimeInfo.IsAdmin) { var httpUrls = wildcardHttpUrls.All(IsRegistered) ? wildcardHttpUrls : localHttpUrls; var httpsUrls = wildcardHttpsUrls.All(IsRegistered) ? wildcardHttpsUrls : localHttpsUrls; Urls.AddRange(httpUrls); - Urls.AddRange(httpsUrls); + Urls.AddRange(httpsUrls); } - else { Urls.AddRange(wildcardHttpUrls);