Merge pull request #969 from jabbera/ssl2

Ssl in mediabrowser against new listener.

1 files changed, 7 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index c3228db92..0c0922800 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -44,6 +44,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private readonly bool _supportsNativeWebSocket;
 
+        private string _certificatePath;
+
         /// <summary>
         /// Gets the local end points.
         /// </summary>
@@ -217,10 +219,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         {
             if (_supportsNativeWebSocket && NativeWebSocket.IsSupported)
             {
+                // Certificate location is ignored here. You need to use netsh 
+                // to assign the certificate to the proper port.
                 return new HttpListenerServer(_logger, OnRequestReceived);
             }
 
-            return new WebSocketSharpListener(_logger, OnRequestReceived);
+            return new WebSocketSharpListener(_logger, OnRequestReceived, _certificatePath);
         }
 
         private void WebSocketHandler(WebSocketConnectEventArgs args)
@@ -425,8 +429,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             GC.SuppressFinalize(this);
         }
 
-        public void StartServer(IEnumerable<string> urlPrefixes)
+        public void StartServer(IEnumerable<string> urlPrefixes, string certificatePath)
         {
+            _certificatePath = certificatePath;
             UrlPrefixes = urlPrefixes.ToList();
             Start(UrlPrefixes.First());
         }