4 files changed, 5 insertions, 46 deletions
diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs
index 3cba84334..a2b42dedb 100644
--- a/MediaBrowser.Common/Net/HttpRequestOptions.cs
+++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs
@@ -106,7 +106,6 @@ namespace MediaBrowser.Common.Net
         {
             EnableHttpCompression = true;
             BufferContent = true;
-            EnableKeepAlive = true;
 
             RequestHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
diff --git a/MediaBrowser.Common/Net/IServerManager.cs b/MediaBrowser.Common/Net/IServerManager.cs
index f81c99ac6..f6ac0ab68 100644
--- a/MediaBrowser.Common/Net/IServerManager.cs
+++ b/MediaBrowser.Common/Net/IServerManager.cs
@@ -11,12 +11,6 @@ namespace MediaBrowser.Common.Net
     public interface IServerManager : IDisposable
     {
         /// <summary>
-        /// Gets a value indicating whether [supports web socket].
-        /// </summary>
-        /// <value><c>true</c> if [supports web socket]; otherwise, <c>false</c>.</value>
-        bool SupportsNativeWebSocket { get; }
-
-        /// <summary>
         /// Gets the web socket port number.
         /// </summary>
         /// <value>The web socket port number.</value>
@@ -26,13 +20,7 @@ namespace MediaBrowser.Common.Net
         /// Starts this instance.
         /// </summary>
         /// <param name="urlPrefixes">The URL prefixes.</param>
-        /// <param name="enableHttpLogging">if set to <c>true</c> [enable HTTP logging].</param>
-        void Start(IEnumerable<string> urlPrefixes, bool enableHttpLogging);
-
-        /// <summary>
-        /// Starts the web socket server.
-        /// </summary>
-        void StartWebSocketServer();
+        void Start(IEnumerable<string> urlPrefixes);
 
         /// <summary>
         /// Sends a message to all clients currently connected via a web socket
diff --git a/MediaBrowser.Common/Net/IWebSocketServer.cs b/MediaBrowser.Common/Net/IWebSocketServer.cs
deleted file mode 100644
index 187e03e09..000000000
--- a/MediaBrowser.Common/Net/IWebSocketServer.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-
-namespace MediaBrowser.Common.Net
-{
-    /// <summary>
-    /// Interface IWebSocketServer
-    /// </summary>
-    public interface IWebSocketServer : IDisposable
-    {
-        /// <summary>
-        /// Starts the specified port number.
-        /// </summary>
-        /// <param name="portNumber">The port number.</param>
-        void Start(int portNumber);
-
-        /// <summary>
-        /// Stops this instance.
-        /// </summary>
-        void Stop();
-
-        /// <summary>
-        /// Occurs when [web socket connected].
-        /// </summary>
-        event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
-
-        /// <summary>
-        /// Gets the port.
-        /// </summary>
-        /// <value>The port.</value>
-        int Port { get; }
-    }
-}
diff --git a/MediaBrowser.Common/Net/MimeTypes.cs b/MediaBrowser.Common/Net/MimeTypes.cs
index dcac5e7ba..0740bf6d1 100644
--- a/MediaBrowser.Common/Net/MimeTypes.cs
+++ b/MediaBrowser.Common/Net/MimeTypes.cs
@@ -143,6 +143,10 @@ namespace MediaBrowser.Common.Net
             {
                 return "image/png";
             }
+            if (ext.Equals(".webp", StringComparison.OrdinalIgnoreCase))
+            {
+                return "image/webp";
+            }
             if (ext.Equals(".ico", StringComparison.OrdinalIgnoreCase))
             {
                 return "image/vnd.microsoft.icon";