Added 'quoted' parameter

Author: khellang

src/Microsoft.Net.Http.Headers/ContentDispositionHeaderValue.cs

@@ -321,7 +321,7 @@ private void SetDate(string parameter, DateTimeOffset? date)
             else
             {
                 // Must always be quoted
-                var dateString = string.Format(CultureInfo.InvariantCulture, "\"{0}\"", HeaderUtilities.FormatDate(date.Value));
+                var dateString = HeaderUtilities.FormatDate(date.Value, quoted: true);
                 if (dateParameter != null)
                 {
                     dateParameter.Value = dateString;

src/Microsoft.Net.Http.Headers/DateTimeFormatter.cs

@@ -16,6 +16,7 @@ internal static class DateTimeFormatter
         private static readonly string[] DayNames = FormatInfo.AbbreviatedDayNames;
 
         private static readonly int Rfc1123DateLength = "ddd, dd MMM yyyy HH:mm:ss GMT".Length;
+        private static readonly int QuotedRfc1123DateLength = Rfc1123DateLength + 2;
 
         // ASCII numbers are in the range 48 - 57.
         private const int AsciiNumberOffset = 0x30;
@@ -24,11 +25,24 @@ internal static class DateTimeFormatter
         private const char Comma = ',';
         private const char Space = ' ';
         private const char Colon = ':';
+        private const char Quote = '"';
 
         public static string ToRfc1123String(this DateTimeOffset dateTime)
+        {
+            return ToRfc1123String(dateTime, false);
+        }
+
+        public static string ToRfc1123String(this DateTimeOffset dateTime, bool quoted)
         {
             var universal = dateTime.UtcDateTime;
-            var target = new InplaceStringBuilder(Rfc1123DateLength);
+
+            var length = quoted ? QuotedRfc1123DateLength : Rfc1123DateLength;
+            var target = new InplaceStringBuilder(length);
+
+            if (quoted)
+            {
+                target.Append(Quote);
+            }
 
             target.Append(DayNames[(int)universal.DayOfWeek]);
             target.Append(Comma);
@@ -43,6 +57,11 @@ public static string ToRfc1123String(this DateTimeOffset dateTime)
             target.Append(Space);
             target.Append(Gmt);
 
+            if (quoted)
+            {
+                target.Append(Quote);
+            }
+
             return target.ToString();
         }
 

src/Microsoft.Net.Http.Headers/HeaderUtilities.cs

@@ -220,7 +220,12 @@ public static bool TryParseDate(string input, out DateTimeOffset result)
 
         public static string FormatDate(DateTimeOffset dateTime)
         {
-            return dateTime.ToRfc1123String();
+            return FormatDate(dateTime, false);
+        }
+
+        public static string FormatDate(DateTimeOffset dateTime, bool quoted)
+        {
+            return dateTime.ToRfc1123String(quoted);
         }
 
         public static string RemoveQuotes(string input)

test/Microsoft.Net.Http.Headers.Tests/HeaderUtilitiesTest.cs

@@ -12,29 +12,33 @@ public static class HeaderUtilitiesTest
 
         [Theory]
         [MemberData(nameof(TestValues))]
-        public static void ReturnsSameResultAsRfc1123String(DateTimeOffset dateTime)
+        public static void ReturnsSameResultAsRfc1123String(DateTimeOffset dateTime, bool quoted)
         {
-            var expected = dateTime.ToString(Rfc1123Format);
-            var actual = HeaderUtilities.FormatDate(dateTime);
+            var formatted = dateTime.ToString(Rfc1123Format);
+            var expected = quoted ? $"\"{formatted}\"" : formatted;
+            var actual = HeaderUtilities.FormatDate(dateTime, quoted);
 
             Assert.Equal(expected, actual);
         }
 
-        public static TheoryData<DateTimeOffset> TestValues
+        public static TheoryData<DateTimeOffset, bool> TestValues
         {
             get
             {
-                var data = new TheoryData<DateTimeOffset>();
+                var data = new TheoryData<DateTimeOffset, bool>();
 
                 var now = DateTimeOffset.Now;
 
-                for (var i = 0; i < 60; i++)
+                foreach (var quoted in new[] { true, false })
                 {
-                    data.Add(now.AddSeconds(i));
-                    data.Add(now.AddMinutes(i));
-                    data.Add(now.AddDays(i));
-                    data.Add(now.AddMonths(i));
-                    data.Add(now.AddYears(i));
+                    for (var i = 0; i < 60; i++)
+                    {
+                        data.Add(now.AddSeconds(i), quoted);
+                        data.Add(now.AddMinutes(i), quoted);
+                        data.Add(now.AddDays(i), quoted);
+                        data.Add(now.AddMonths(i), quoted);
+                        data.Add(now.AddYears(i), quoted);
+                    }
                 }
 
                 return data;