From c035f2baa1f3537d298a6559d15bd7ca40188e5d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 12 Nov 2016 01:58:50 -0500
Subject: update responses

---
 .../HttpServer/HttpListenerHost.cs                      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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

diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 64f498b12..49c664eec 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -86,9 +86,7 @@ namespace Emby.Server.Implementations.HttpServer
 
         public string GlobalResponse { get; set; }
 
-        public override void Configure()
-        {
-            var mapExceptionToStatusCode = new Dictionary<Type, int>
+        readonly Dictionary<Type, int> _mapExceptionToStatusCode = new Dictionary<Type, int>
             {
                 {typeof (InvalidOperationException), 500},
                 {typeof (NotImplementedException), 500},
@@ -102,6 +100,8 @@ namespace Emby.Server.Implementations.HttpServer
                 {typeof (NotSupportedException), 500}
             };
 
+        public override void Configure()
+        {
             var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
             foreach (var filter in requestFilters)
             {
@@ -240,7 +240,12 @@ namespace Emby.Server.Implementations.HttpServer
                     return;
                 }
 
-                httpRes.StatusCode = 500;
+                int statusCode;
+                if (!_mapExceptionToStatusCode.TryGetValue(ex.GetType(), out statusCode))
+                {
+                    statusCode = 500;
+                }
+                httpRes.StatusCode = statusCode;
 
                 httpRes.ContentType = "text/html";
                 httpRes.Write(ex.Message);
@@ -518,6 +523,10 @@ namespace Emby.Server.Implementations.HttpServer
                 {
                     await handler.ProcessRequestAsync(httpReq, httpRes, operationName).ConfigureAwait(false);
                 }
+                else
+                {
+                    ErrorHandler(new FileNotFoundException(), httpReq);
+                }
             }
             catch (Exception ex)
             {
-- 
cgit v1.2.3