From 675754bc5c5dad9b1c68b1222f88eee5e96f3d4a Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sun, 8 Sep 2019 21:07:29 +0200
Subject: Possible fix for MrMC

---
 .../HttpClientManager/HttpClientManager.cs         | 31 +++++++---------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs')

diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
index 0dd4d4ca5..0e6083773 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
@@ -83,7 +83,16 @@ namespace Emby.Server.Implementations.HttpClientManager
 
             var request = new HttpRequestMessage(method, url);
 
-            AddRequestHeaders(request, options);
+            foreach (var header in options.RequestHeaders)
+            {
+                request.Headers.TryAddWithoutValidation(header.Key, header.Value);
+            }
+
+            if (options.EnableDefaultUserAgent
+                && !request.Headers.TryGetValues(HeaderNames.UserAgent, out _))
+            {
+                request.Headers.Add(HeaderNames.UserAgent, _defaultUserAgentFn());
+            }
 
             switch (options.DecompressionMethod)
             {
@@ -121,26 +130,6 @@ namespace Emby.Server.Implementations.HttpClientManager
             return request;
         }
 
-        private void AddRequestHeaders(HttpRequestMessage request, HttpRequestOptions options)
-        {
-            var hasUserAgent = false;
-
-            foreach (var header in options.RequestHeaders)
-            {
-                if (string.Equals(header.Key, HeaderNames.UserAgent, StringComparison.OrdinalIgnoreCase))
-                {
-                    hasUserAgent = true;
-                }
-
-                request.Headers.Add(header.Key, header.Value);
-            }
-
-            if (!hasUserAgent && options.EnableDefaultUserAgent)
-            {
-                request.Headers.Add(HeaderNames.UserAgent, _defaultUserAgentFn());
-            }
-        }
-
         /// <summary>
         /// Gets the response internal.
         /// </summary>
-- 
cgit v1.2.3