Merge pull request #969 from jabbera/ssl2

Ssl in mediabrowser against new listener.

1 files changed, 23 insertions, 1 deletions

diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index f7ff5eef1..29c530438 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -133,6 +133,11 @@ namespace MediaBrowser.Server.Startup.Common
                     "http://+:" + ServerConfigurationManager.Configuration.HttpServerPortNumber + "/" + WebApplicationName + "/"
                 };
 
+                if (ServerConfigurationManager.Configuration.UseHttps)
+                {
+                    list.Add("https://+:" + ServerConfigurationManager.Configuration.HttpsPortNumber + "/" + WebApplicationName + "/");
+                }
+
                 return list;
             }
         }
@@ -805,7 +810,7 @@ namespace MediaBrowser.Server.Startup.Common
         {
             try
             {
-                ServerManager.Start(HttpServerUrlPrefixes);
+                ServerManager.Start(HttpServerUrlPrefixes, CertificatePath);
             }
             catch (Exception ex)
             {
@@ -972,6 +977,8 @@ namespace MediaBrowser.Server.Startup.Common
                 CachePath = ApplicationPaths.CachePath,
                 MacAddress = GetMacAddress(),
                 HttpServerPortNumber = HttpServerPort,
+                UseHttps = UseHttps,
+                CertificatePath = CertificatePath,
                 OperatingSystem = OperatingSystemDisplayName,
                 CanSelfRestart = CanSelfRestart,
                 CanSelfUpdate = CanSelfUpdate,
@@ -1046,6 +1053,21 @@ namespace MediaBrowser.Server.Startup.Common
             get { return ServerConfigurationManager.Configuration.HttpServerPortNumber; }
         }
 
+        public bool UseHttps
+        {
+            get { return this.ServerConfigurationManager.Configuration.UseHttps; }
+        }
+
+        public string CertificatePath
+        {
+            get { return this.ServerConfigurationManager.Configuration.CertificatePath; }
+        }
+
+        public int HttpsServerPort
+        {
+            get { return ServerConfigurationManager.Configuration.HttpsPortNumber; }
+        }
+
         /// <summary>
         /// Gets the mac address.
         /// </summary>