Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

3 files changed, 22 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index f1e371c1a..990d23970 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -93,6 +93,11 @@ namespace MediaBrowser.Controller.Net
             }
         }
 
+        protected virtual void ParseMessageParams(string[] values)
+        {
+            
+        }
+
         /// <summary>
         /// Starts sending messages over a web socket
         /// </summary>
@@ -104,6 +109,11 @@ namespace MediaBrowser.Controller.Net
             var dueTimeMs = long.Parse(vals[0], UsCulture);
             var periodMs = long.Parse(vals[1], UsCulture);
 
+            if (vals.Length > 2)
+            {
+                ParseMessageParams(vals.Skip(2).ToArray());
+            }
+
             var cancellationTokenSource = new CancellationTokenSource();
 
             Logger.Info("{1} Begin transmitting over websocket to {0}", message.Connection.RemoteEndPoint, GetType().Name);
diff --git a/MediaBrowser.Controller/Net/IHttpServer.cs b/MediaBrowser.Controller/Net/IHttpServer.cs
index 5b179d479..315b48b83 100644
--- a/MediaBrowser.Controller/Net/IHttpServer.cs
+++ b/MediaBrowser.Controller/Net/IHttpServer.cs
@@ -1,4 +1,3 @@
-using MediaBrowser.Common.Net;
 using System;
 using System.Collections.Generic;
 
@@ -16,10 +15,18 @@ namespace MediaBrowser.Controller.Net
         IEnumerable<string> UrlPrefixes { get; }
 
         /// <summary>
+        /// Gets the certificate path.
+        /// </summary>
+        /// <value>The certificate path.</value>
+        string CertificatePath { get; }
+
+        /// <summary>
         /// Starts the specified server name.
         /// </summary>
         /// <param name="urlPrefixes">The URL prefixes.</param>
-        void StartServer(IEnumerable<string> urlPrefixes);
+        /// <param name="certificatePath">If an https prefix is specified, 
+        /// the ssl certificate localtion on the file system.</param>
+        void StartServer(IEnumerable<string> urlPrefixes, string certificatePath);
 
         /// <summary>
         /// Gets the local end points.
diff --git a/MediaBrowser.Controller/Net/IServerManager.cs b/MediaBrowser.Controller/Net/IServerManager.cs
index dff086347..d90a0f8ed 100644
--- a/MediaBrowser.Controller/Net/IServerManager.cs
+++ b/MediaBrowser.Controller/Net/IServerManager.cs
@@ -15,7 +15,9 @@ namespace MediaBrowser.Controller.Net
         /// Starts this instance.
         /// </summary>
         /// <param name="urlPrefixes">The URL prefixes.</param>
-        void Start(IEnumerable<string> urlPrefixes);
+        /// <param name="certificatePath">If an https prefix is specified, 
+        /// the ssl certificate localtion on the file system.</param>
+        void Start(IEnumerable<string> urlPrefixes, string certificatePath);
 
         /// <summary>
         /// Sends a message to all clients currently connected via a web socket