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

---
 MediaBrowser.Controller/Net/IHttpServer.cs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'MediaBrowser.Controller/Net/IHttpServer.cs')

diff --git a/MediaBrowser.Controller/Net/IHttpServer.cs b/MediaBrowser.Controller/Net/IHttpServer.cs
index f41303007..cede9a98f 100644
--- a/MediaBrowser.Controller/Net/IHttpServer.cs
+++ b/MediaBrowser.Controller/Net/IHttpServer.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Services;
+using Microsoft.AspNetCore.Http;
 
 namespace MediaBrowser.Controller.Net
 {
@@ -35,5 +38,24 @@ namespace MediaBrowser.Controller.Net
         /// If set, all requests will respond with this message
         /// </summary>
         string GlobalResponse { get; set; }
+
+        /// <summary>
+        /// Sends the http context to the socket listener
+        /// </summary>
+        /// <param name="ctx"></param>
+        /// <returns></returns>
+        Task ProcessWebSocketRequest(HttpContext ctx);
+
+        /// <summary>
+        /// The HTTP request handler
+        /// </summary>
+        /// <param name="httpReq"></param>
+        /// <param name="urlString"></param>
+        /// <param name="host"></param>
+        /// <param name="localPath"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        Task RequestHandler(IHttpRequest httpReq, string urlString, string host, string localPath,
+            CancellationToken cancellationToken);
     }
 }
-- 
cgit v1.2.3


From e3b844b5aa34ef6a8f4a23c053115f4eabadcbf7 Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Thu, 7 Mar 2019 22:49:41 +0100
Subject: Add urlprefixes during init

---
 Emby.Server.Implementations/ApplicationHost.cs             | 2 +-
 Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | 6 ++++--
 MediaBrowser.Controller/Net/IHttpServer.cs                 | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Controller/Net/IHttpServer.cs')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index a581214c7..f7d9bad1b 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1056,7 +1056,7 @@ namespace Emby.Server.Implementations
                         .Where(i => i != null)
                         .ToArray();
 
-            HttpServer.Init(GetExports<IService>(false), GetExports<IWebSocketListener>());
+            HttpServer.Init(GetExports<IService>(false), GetExports<IWebSocketListener>(), GetUrlPrefixes());
 
             LibraryManager.AddParts(GetExports<IResolverIgnoreRule>(),
                 GetExports<IItemResolver>(),
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index eab755cef..e8d47cad5 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -676,10 +676,12 @@ namespace Emby.Server.Implementations.HttpServer
         /// Adds the rest handlers.
         /// </summary>
         /// <param name="services">The services.</param>
-        public void Init(IEnumerable<IService> services, IEnumerable<IWebSocketListener> listeners)
+        /// <param name="listeners"></param>
+        /// <param name="urlPrefixes"></param>
+        public void Init(IEnumerable<IService> services, IEnumerable<IWebSocketListener> listeners, IEnumerable<string> urlPrefixes)
         {
             _webSocketListeners = listeners.ToArray();
-
+            UrlPrefixes = urlPrefixes.ToArray();
             ServiceController = new ServiceController();
 
             Logger.LogInformation("Calling ServiceStack AppHost.Init");
diff --git a/MediaBrowser.Controller/Net/IHttpServer.cs b/MediaBrowser.Controller/Net/IHttpServer.cs
index cede9a98f..46933c046 100644
--- a/MediaBrowser.Controller/Net/IHttpServer.cs
+++ b/MediaBrowser.Controller/Net/IHttpServer.cs
@@ -32,7 +32,7 @@ namespace MediaBrowser.Controller.Net
         /// <summary>
         /// Inits this instance.
         /// </summary>
-        void Init(IEnumerable<IService> services, IEnumerable<IWebSocketListener> listener);
+        void Init(IEnumerable<IService> services, IEnumerable<IWebSocketListener> listener, IEnumerable<string> urlPrefixes);
 
         /// <summary>
         /// If set, all requests will respond with this message
-- 
cgit v1.2.3