From e342b7bc71f16286da699bcce299b76df63360dc Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Tue, 26 Feb 2019 21:27:02 +0100
Subject: Extend the IHttpServer interface to avoid the typecasting

---
 Emby.Server.Implementations/HttpServer/IHttpListener.cs | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer/IHttpListener.cs')

diff --git a/Emby.Server.Implementations/HttpServer/IHttpListener.cs b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
index 8350913610..1ef65d9d73 100644
--- a/Emby.Server.Implementations/HttpServer/IHttpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.Net;
-using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Services;
 
 namespace Emby.Server.Implementations.HttpServer
@@ -28,18 +26,6 @@ namespace Emby.Server.Implementations.HttpServer
         /// <value>The web socket handler.</value>
         Action<WebSocketConnectEventArgs> WebSocketConnected { get; set; }
 
-        /// <summary>
-        /// Gets or sets the web socket connecting.
-        /// </summary>
-        /// <value>The web socket connecting.</value>
-        Action<WebSocketConnectingEventArgs> WebSocketConnecting { get; set; }
-
-        /// <summary>
-        /// Starts this instance.
-        /// </summary>
-        /// <param name="urlPrefixes">The URL prefixes.</param>
-        void Start(IEnumerable<string> urlPrefixes);
-
         /// <summary>
         /// Stops this instance.
         /// </summary>
-- 
cgit v1.2.3


From 913e80fd5527775ea71d6f9606f49c5494cb7b63 Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Tue, 5 Mar 2019 20:35:07 +0100
Subject: Add ProcessWebSocketRequest to IHttpListener

---
 Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | 5 ++---
 Emby.Server.Implementations/HttpServer/IHttpListener.cs    | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'Emby.Server.Implementations/HttpServer/IHttpListener.cs')

diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 293b28e74b..d1b1b5b242 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -756,11 +756,10 @@ namespace Emby.Server.Implementations.HttpServer
 
         public Task ProcessWebSocketRequest(HttpContext context)
         {
-            // TODO
-            return ((WebSocketSharpListener)_socketListener).ProcessWebSocketRequest(context);
+            return _socketListener.ProcessWebSocketRequest(context);
         }
-        //TODO Add Jellyfin Route Path Normalizer
 
+        //TODO Add Jellyfin Route Path Normalizer
         private static string NormalizeEmbyRoutePath(string path)
         {
             if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
diff --git a/Emby.Server.Implementations/HttpServer/IHttpListener.cs b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
index 1ef65d9d73..005656d2c1 100644
--- a/Emby.Server.Implementations/HttpServer/IHttpListener.cs
+++ b/Emby.Server.Implementations/HttpServer/IHttpListener.cs
@@ -3,6 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.Net;
 using MediaBrowser.Model.Services;
+using Microsoft.AspNetCore.Http;
 
 namespace Emby.Server.Implementations.HttpServer
 {
@@ -30,5 +31,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// Stops this instance.
         /// </summary>
         Task Stop();
+
+        Task ProcessWebSocketRequest(HttpContext ctx);
     }
 }
-- 
cgit v1.2.3