Feedback

Author: benaadams

src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameHeaders.cs

@@ -18,13 +18,14 @@ public abstract class FrameHeaders : IHeaderDictionary
         protected Dictionary<string, StringValues> MaybeUnknown;
         protected Dictionary<string, StringValues> Unknown => MaybeUnknown ?? (MaybeUnknown = new Dictionary<string, StringValues>(StringComparer.OrdinalIgnoreCase));
 
-        public long? ContentLength {
+        public long? ContentLength
+        {
             get { return _contentLength; }
             set
             {
                 if (value.HasValue && value.Value < 0)
                 {
-                    ThrowInvalidResponseContentLengthException(value.Value);
+                    ThrowInvalidContentLengthException(value.Value);
                 }
                 _contentLength = value;
             }
@@ -423,26 +424,11 @@ public static unsafe TransferCoding GetFinalTransferCoding(StringValues transfer
             return transferEncodingOptions;
         }
 
-        protected static void ThrowInvalidResponseContentLengthException(long value)
+        private static void ThrowInvalidContentLengthException(long value)
         {
             throw new ArgumentOutOfRangeException($"Invalid Content-Length: \"{value}\". Value must be a positive integral number.");
         }
 
-        protected static void ThrowInvalidResponseContentLengthException(string value)
-        {
-            throw new InvalidOperationException($"Invalid Content-Length: \"{value}\". Value must be a positive integral number.");
-        }
-
-        protected static void ThrowInvalidRequestContentLengthException(string value)
-        {
-            throw BadHttpRequestException.GetException(RequestRejectionReason.InvalidContentLength, value);
-        }
-
-        protected static void ThrowRequestMultipleContentLengths()
-        {
-            throw BadHttpRequestException.GetException(RequestRejectionReason.MultipleContentLengths);
-        }
-
         private static void ThrowInvalidHeaderCharacter(char ch)
         {
             throw new InvalidOperationException(string.Format("Invalid non-ASCII or control character in header: 0x{0:X4}", (ushort)ch));

src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameRequestHeaders.cs

@@ -17,7 +17,7 @@ private static long ParseContentLength(string value)
             long parsed;
             if (!HeaderUtilities.TryParseInt64(value, out parsed))
             {
-                ThrowInvalidRequestContentLengthException(value);
+                ThrowInvalidContentLengthException(value);
             }
 
             return parsed;
@@ -46,6 +46,16 @@ private unsafe void AppendUnknownHeaders(byte* pKeyBytes, int keyLength, string
             Unknown[key] = AppendValue(existing, value);
         }
 
+        private static void ThrowInvalidContentLengthException(string value)
+        {
+            throw BadHttpRequestException.GetException(RequestRejectionReason.InvalidContentLength, value);
+        }
+
+        private static void ThrowMultipleContentLengths()
+        {
+            throw BadHttpRequestException.GetException(RequestRejectionReason.MultipleContentLengths);
+        }
+
         public Enumerator GetEnumerator()
         {
             return new Enumerator(this);

src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/FrameResponseHeaders.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
@@ -59,7 +60,7 @@ private static long ParseContentLength(string value)
             long parsed;
             if (!HeaderUtilities.TryParseInt64(value, out parsed))
             {
-                ThrowInvalidResponseContentLengthException(value);
+                ThrowInvalidContentLengthException(value);
             }
 
             return parsed;
@@ -72,6 +73,11 @@ private void SetValueUnknown(string key, StringValues value)
             Unknown[key] = value;
         }
 
+        private static void ThrowInvalidContentLengthException(string value)
+        {
+            throw new InvalidOperationException($"Invalid Content-Length: \"{value}\". Value must be a positive integral number.");
+        }
+
         public partial struct Enumerator : IEnumerator<KeyValuePair<string, StringValues>>
         {
             private readonly FrameResponseHeaders _collection;