Rebalance common headers (#31495)

src/Servers/Kestrel/Core/test/Http2HPackEncoderTests.cs

@@ -86,9 +86,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
             var result = buffer.Slice(0, length).ToArray();
             var hex = BitConverter.ToString(result);
             Assert.Equal(
-                "48-03-33-30-32-58-07-70-72-69-76-61-74-65-61-1D-" +
-                "4D-6F-6E-2C-20-32-31-20-4F-63-74-20-32-30-31-33-" +
-                "20-32-30-3A-31-33-3A-32-31-20-47-4D-54-6E-17-68-" +
+                "48-03-33-30-32-61-1D-4D-6F-6E-2C-20-32-31-20-4F-" +
+                "63-74-20-32-30-31-33-20-32-30-3A-31-33-3A-32-31-" +
+                "20-47-4D-54-58-07-70-72-69-76-61-74-65-6E-17-68-" +
                 "74-74-70-73-3A-2F-2F-77-77-77-2E-65-78-61-6D-70-" +
                 "6C-65-2E-63-6F-6D", hex);
 
@@ -101,13 +101,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
                 },
                 e =>
                 {
-                    Assert.Equal("Date", e.Name);
-                    Assert.Equal("Mon, 21 Oct 2013 20:13:21 GMT", e.Value);
+                    Assert.Equal("Cache-Control", e.Name);
+                    Assert.Equal("private", e.Value);
                 },
                 e =>
                 {
-                    Assert.Equal("Cache-Control", e.Name);
-                    Assert.Equal("private", e.Value);
+                    Assert.Equal("Date", e.Name);
+                    Assert.Equal("Mon, 21 Oct 2013 20:13:21 GMT", e.Value);
                 },
                 e =>
                 {
@@ -137,13 +137,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
                 },
                 e =>
                 {
-                    Assert.Equal("Date", e.Name);
-                    Assert.Equal("Mon, 21 Oct 2013 20:13:21 GMT", e.Value);
+                    Assert.Equal("Cache-Control", e.Name);
+                    Assert.Equal("private", e.Value);
                 },
                 e =>
                 {
-                    Assert.Equal("Cache-Control", e.Name);
-                    Assert.Equal("private", e.Value);
+                    Assert.Equal("Date", e.Name);
+                    Assert.Equal("Mon, 21 Oct 2013 20:13:21 GMT", e.Value);
                 });
 
             // Third response
@@ -157,9 +157,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
             result = buffer.Slice(0, length).ToArray();
             hex = BitConverter.ToString(result);
             Assert.Equal(
-                "88-C1-61-1D-4D-6F-6E-2C-20-32-31-20-4F-63-74-20-" +
-                "32-30-31-33-20-32-30-3A-31-33-3A-32-32-20-47-4D-" +
-                "54-5A-04-67-7A-69-70-C1-1F-28-38-66-6F-6F-3D-41-" +
+                "88-61-1D-4D-6F-6E-2C-20-32-31-20-4F-63-74-20-32-" +
+                "30-31-33-20-32-30-3A-31-33-3A-32-32-20-47-4D-54-" +
+                "C1-5A-04-67-7A-69-70-C1-1F-28-38-66-6F-6F-3D-41-" +
                 "53-44-4A-4B-48-51-4B-42-5A-58-4F-51-57-45-4F-50-" +
                 "49-55-41-58-51-57-45-4F-49-55-3B-20-6D-61-78-2D-" +
                 "61-67-65-3D-33-36-30-30-3B-20-76-65-72-73-69-6F-" +

src/Servers/Kestrel/Core/test/Http2HeadersEnumeratorTests.cs

@@ -40,10 +40,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
             Assert.Equal(new[]
             {
                 CreateHeaderResult(H2StaticTable.Date, "Date", "Date!"),
-                CreateHeaderResult(-1, "Grpc-Encoding", "Identity!"),
                 CreateHeaderResult(H2StaticTable.AcceptRanges, "Accept-Ranges", "AcceptRanges!"),
                 CreateHeaderResult(H2StaticTable.Age, "Age", "1"),
                 CreateHeaderResult(H2StaticTable.Age, "Age", "2"),
+                CreateHeaderResult(-1, "Grpc-Encoding", "Identity!"),
                 CreateHeaderResult(H2StaticTable.ContentLength, "Content-Length", "9"),
                 CreateHeaderResult(-1, "Name1", "Value1"),
                 CreateHeaderResult(-1, "Name2", "Value2-1"),

src/Servers/Kestrel/shared/KnownHeaders.cs

@@ -85,20 +85,11 @@ namespace CodeGenerator
                 HeaderNames.GrpcEncoding,
                 HeaderNames.KeepAlive,
                 HeaderNames.Pragma,
-                HeaderNames.Trailer,
                 HeaderNames.TransferEncoding,
                 HeaderNames.Upgrade,
                 HeaderNames.Via,
                 HeaderNames.Warning,
-                HeaderNames.Allow,
                 HeaderNames.ContentType,
-                HeaderNames.ContentEncoding,
-                HeaderNames.ContentLanguage,
-                HeaderNames.ContentLocation,
-                HeaderNames.ContentMD5,
-                HeaderNames.ContentRange,
-                HeaderNames.Expires,
-                HeaderNames.LastModified
             };
             // http://www.w3.org/TR/cors/#syntax
             var corsRequestHeaders = new[]
@@ -150,9 +141,11 @@ namespace CodeGenerator
                 HeaderNames.CorrelationContext,
                 HeaderNames.TraceParent,
                 HeaderNames.TraceState,
-                HeaderNames.Baggage
+                HeaderNames.Baggage,
             })
             .Concat(corsRequestHeaders)
+            .OrderBy(header => header)
+            .OrderBy(header => !requestPrimaryHeaders.Contains(header))
             .Select((header, index) => new KnownHeader
             {
                 Name = header,
@@ -197,6 +190,7 @@ namespace CodeGenerator
             {
                 HeaderNames.AcceptRanges,
                 HeaderNames.Age,
+                HeaderNames.Allow,
                 HeaderNames.AltSvc,
                 HeaderNames.ETag,
                 HeaderNames.Location,
@@ -206,9 +200,19 @@ namespace CodeGenerator
                 HeaderNames.Server,
                 HeaderNames.SetCookie,
                 HeaderNames.Vary,
+                HeaderNames.Expires,
                 HeaderNames.WWWAuthenticate,
+                HeaderNames.ContentRange,
+                HeaderNames.ContentEncoding,
+                HeaderNames.ContentLanguage,
+                HeaderNames.ContentLocation,
+                HeaderNames.ContentMD5,
+                HeaderNames.LastModified,
+                HeaderNames.Trailer,
             })
             .Concat(corsResponseHeaders)
+            .OrderBy(header => header)
+            .OrderBy(header => !responsePrimaryHeaders.Contains(header))
             .Select((header, index) => new KnownHeader
             {
                 Name = header,
@@ -232,6 +236,8 @@ namespace CodeGenerator
                 HeaderNames.GrpcMessage,
                 HeaderNames.GrpcStatus
             }
+            .OrderBy(header => header)
+            .OrderBy(header => !responsePrimaryHeaders.Contains(header))
             .Select((header, index) => new KnownHeader
             {
                 Name = header,