Merge branch 'amosonn-case-insensitive-header-names' into dev

Author: alexeyzimarev

src/RestSharp/KnownHeaders.cs

@@ -14,6 +14,7 @@
 // 
 
 // ReSharper disable InconsistentNaming
+// ReSharper disable MemberCanBePrivate.Global
 
 namespace RestSharp;
 
@@ -32,4 +33,13 @@ public static class KnownHeaders {
     public const string LastModified       = "Last-Modified";
     public const string ContentMD5         = "Content-MD5";
     public const string Host               = "Host";
-}
+
+    internal static readonly string[] ContentHeaders = {
+        Allow, Expires, ContentDisposition, ContentEncoding, ContentLanguage, ContentLength, ContentLocation, ContentRange, ContentType, ContentMD5,
+        LastModified
+    };
+
+    static readonly HashSet<string> ContentHeadersHash = new(ContentHeaders.Select(x => x.ToLower()));
+
+    internal static bool IsContentHeader(string key) => ContentHeadersHash.Contains(key.ToLower());
+}

src/RestSharp/Request/HttpRequestMessageExtensions.cs

@@ -20,7 +20,7 @@ namespace RestSharp;
 
 static class HttpRequestMessageExtensions {
     public static void AddHeaders(this HttpRequestMessage message, RequestHeaders headers) {
-        var headerParameters = headers.Parameters.Where(x => !RequestContent.ContentHeaders.Contains(x.Name));
+        var headerParameters = headers.Parameters.Where(x => !KnownHeaders.IsContentHeader(x.Name!));
 
         headerParameters.ForEach(x => AddHeader(x, message.Headers));
 
@@ -31,4 +31,4 @@ void AddHeader(Parameter parameter, HttpHeaders httpHeaders) {
             httpHeaders.TryAddWithoutValidation(parameter.Name!, parameterStringValue);
         }
     }
-}
+}

src/RestSharp/Request/RequestContent.cs

@@ -26,11 +26,7 @@ class RequestContent : IDisposable {
     readonly RestRequest  _request;
     readonly List<Stream> _streams = new();
 
-    internal static readonly string[] ContentHeaders = {
-        Allow, Expires,
-        ContentDisposition, ContentEncoding, ContentLanguage, ContentLength, ContentLocation, ContentRange, ContentType, ContentMD5,
-        LastModified
-    };
+    
 
     HttpContent? Content { get; set; }
 
@@ -164,15 +160,15 @@ void AddPostParameters(ParametersCollection? postParameters) {
             var formContent = new FormUrlEncodedContent(
                 _request.Parameters
                     .Where(x => x.Type == ParameterType.GetOrPost)
-                    .Select(x => new KeyValuePair<string, string>(x.Name!, x.Value!.ToString()!))!
+                    .Select(x => new KeyValuePair<string, string>(x.Name!, x.Value!.ToString()!))
             );
             Content = formContent;
         }
     }
 
     void AddHeaders() {
         var contentHeaders = _request.Parameters
-            .Where(x => x.Type == ParameterType.HttpHeader && ContentHeaders.Contains(x.Name))
+            .Where(x => x.Type == ParameterType.HttpHeader && IsContentHeader(x.Name!))
             .ToArray();
 
         if (contentHeaders.Length > 0 && Content == null) {
@@ -208,4 +204,4 @@ public void Dispose() {
         _streams.ForEach(x => x.Dispose());
         Content?.Dispose();
     }
-}
+}

src/RestSharp/Request/RequestHeaders.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 // 
 
+// ReSharper disable InvertIf
 namespace RestSharp; 
 
 class RequestHeaders {

test/RestSharp.Tests/RestContentTests.cs

@@ -0,0 +1,15 @@
+namespace RestSharp.Tests;
+
+public class RestContentTests {
+    [Fact]
+    public void RestContent_CaseInsensitiveHeaders() {
+        const string myContentType = "application/x-custom";
+
+        var request = new RestRequest("resource").AddHeader("coNteNt-TypE", myContentType);
+        var content = new RequestContent(new RestClient(), request);
+
+        var httpContent = content.BuildContent();
+
+        httpContent.Headers.ContentType!.MediaType.Should().Be(myContentType);
+    }
+}