Merge pull request #3037 from ConfusedPolarBear/access-control

Fix CORS header not being added to exceptions
5 years ago · d9e2f56bd2
parent 585e9e6220 949e4d3e64
commit d9e2f56bd2
1 changed files with 9 additions and 0 deletions
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@ -496,6 +496,15 @@ namespace Emby.Server.Implementations.HttpServer
                {
                    var requestInnerEx = GetActualException(requestEx);
                    var statusCode = GetStatusCode(requestInnerEx);
+
+                    foreach (var (key, value) in GetDefaultCorsHeaders(httpReq))
+                    {
+                        if (!httpRes.Headers.ContainsKey(key))
+                        {
+                            httpRes.Headers.Add(key, value);
+                        }
+                    }
+
                    bool ignoreStackTrace =
                        requestInnerEx is SocketException
                        || requestInnerEx is IOException