#407 Add ContentLength to IHeaderDictionary

Author: Tratcher

src/Microsoft.AspNetCore.Http.Features/IHeaderDictionary.cs

@@ -17,5 +17,10 @@ public interface IHeaderDictionary : IDictionary<string, StringValues>
         /// <param name="key"></param>
         /// <returns>The stored value, or StringValues.Empty if the key is not present.</returns>
         new StringValues this[string key] { get; set; }
+
+        /// <summary>
+        /// Strongly typed access to the Content-Type header. Implementations must keep this in sync with the string representation.
+        /// </summary>
+        long? ContentLength { get; set; }
     }
 }

src/Microsoft.AspNetCore.Http/HeaderDictionary.cs

@@ -5,6 +5,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Http
 {
@@ -97,6 +98,34 @@ StringValues IDictionary<string, StringValues>.this[string key]
             set { this[key] = value; }
         }
 
+        public long? ContentLength
+        {
+            get
+            {
+                long value;
+                var rawValue = this[HeaderNames.ContentLength];
+                if (rawValue.Count == 1 &&
+                    !string.IsNullOrWhiteSpace(rawValue[0]) &&
+                    HeaderUtilities.TryParseInt64(new StringSegment(rawValue[0]).Trim(), out value))
+                {
+                    return value;
+                }
+
+                return null;
+            }
+            set
+            {
+                if (value.HasValue)
+                {
+                    this[HeaderNames.ContentLength] = HeaderUtilities.FormatInt64(value.Value);
+                }
+                else
+                {
+                    this.Remove(HeaderNames.ContentLength);
+                }
+            }
+        }
+
         /// <summary>
         /// Gets the number of elements contained in the <see cref="HeaderDictionary" />;.
         /// </summary>

src/Microsoft.AspNetCore.Http/Internal/DefaultHttpRequest.cs

@@ -72,14 +72,8 @@ public override QueryString QueryString
 
         public override long? ContentLength
         {
-            get
-            {
-                return ParsingHelpers.GetContentLength(Headers);
-            }
-            set
-            {
-                ParsingHelpers.SetContentLength(Headers, value);
-            }
+            get { return Headers.ContentLength; }
+            set { Headers.ContentLength = value; }
         }
 
         public override Stream Body

src/Microsoft.AspNetCore.Http/Internal/DefaultHttpResponse.cs

@@ -63,14 +63,8 @@ public override Stream Body
 
         public override long? ContentLength
         {
-            get
-            {
-                return ParsingHelpers.GetContentLength(Headers);
-            }
-            set
-            {
-                ParsingHelpers.SetContentLength(Headers, value);
-            }
+            get { return Headers.ContentLength; }
+            set { Headers.ContentLength = value; }
         }
 
         public override string ContentType

src/Microsoft.AspNetCore.Http/Internal/ParsingHelpers.cs

@@ -403,41 +403,5 @@ private static string DeQuote(string value)
 
             return value;
         }
-
-        public static long? GetContentLength(IHeaderDictionary headers)
-        {
-            if (headers == null)
-            {
-                throw new ArgumentNullException(nameof(headers));
-            }
-
-            long value;
-            var rawValue = headers[HeaderNames.ContentLength];
-            if (rawValue.Count == 1 &&
-                !string.IsNullOrWhiteSpace(rawValue[0]) &&
-                HeaderUtilities.TryParseInt64(new StringSegment(rawValue[0]).Trim(), out value))
-            {
-                return value;
-            }
-
-            return null;
-        }
-
-        public static void SetContentLength(IHeaderDictionary headers, long? value)
-        {
-            if (headers == null)
-            {
-                throw new ArgumentNullException(nameof(headers));
-            }
-
-            if (value.HasValue)
-            {
-                headers[HeaderNames.ContentLength] = HeaderUtilities.FormatInt64(value.Value);
-            }
-            else
-            {
-                headers.Remove(HeaderNames.ContentLength);
-            }
-        }
     }
 }

src/Microsoft.AspNetCore.Owin/DictionaryStringValuesWrapper.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Owin
 {
@@ -42,6 +43,40 @@ StringValues IDictionary<string, StringValues>.this[string key]
             set { Inner[key] = value; }
         }
 
+        public long? ContentLength
+        {
+            get
+            {
+                long value;
+
+                string[] rawValue;
+                if (!Inner.TryGetValue(HeaderNames.ContentLength, out rawValue))
+                {
+                    return null;
+                }
+
+                if (rawValue.Length == 1 &&
+                    !string.IsNullOrWhiteSpace(rawValue[0]) &&
+                    HeaderUtilities.TryParseInt64(new StringSegment(rawValue[0]).Trim(), out value))
+                {
+                    return value;
+                }
+
+                return null;
+            }
+            set
+            {
+                if (value.HasValue)
+                {
+                    Inner[HeaderNames.ContentLength] = (StringValues)HeaderUtilities.FormatInt64(value.Value);
+                }
+                else
+                {
+                    Inner.Remove(HeaderNames.ContentLength);
+                }
+            }
+        }
+
         int ICollection<KeyValuePair<string, StringValues>>.Count => Inner.Count;
 
         bool ICollection<KeyValuePair<string, StringValues>>.IsReadOnly => Inner.IsReadOnly;