Fix merge

dotnet · Nov 29, 2021 · 2eacb37 · 2eacb37
1 parent e30f4a8
commit 2eacb37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Servers/Kestrel/Core/test/Http3/Http3QPackEncoderTests.cs b/src/Servers/Kestrel/Core/test/Http3/Http3QPackEncoderTests.cs
@@ -136,7 +136,7 @@ public void BeginEncodeHeaders_StaticKey_WriteStaticNameAndFullValue()
         Span<byte> buffer = new byte[1024 * 16];
 
         var headers = (IHeaderDictionary)new HttpResponseHeaders();
-        headers.ContentType = "application/json";
+        headers.ContentType = "application/custom";
 
         var totalHeaderSize = 0;
         var enumerator = new Http3HeadersEnumerator();
@@ -146,6 +146,6 @@ public void BeginEncodeHeaders_StaticKey_WriteStaticNameAndFullValue()
 
         var result = buffer.Slice(2, length - 2).ToArray();
         var hex = BitConverter.ToString(result);
-        Assert.Equal("5F-1D-10-61-70-70-6C-69-63-61-74-69-6F-6E-2F-6A-73-6F-6E", hex);
+        Assert.Equal("5F-1D-12-61-70-70-6C-69-63-61-74-69-6F-6E-2F-63-75-73-74-6F-6D", hex);
     }
 }
diff --git a/src/Servers/Kestrel/shared/KnownHeaders.cs b/src/Servers/Kestrel/shared/KnownHeaders.cs
@@ -1431,7 +1431,7 @@ private static IEnumerable<QPackGroup> GroupQPack(KnownHeader[] headers)
         var staticHeaders = new (int Index, System.Net.Http.QPack.HeaderField HeaderField)[H3StaticTable.Count];
         for (var i = 0; i < H3StaticTable.Count; i++)
         {
-            staticHeaders[i] = (i, H3StaticTable.GetHeaderFieldAt(i));
+            staticHeaders[i] = (i, H3StaticTable.Get(i));
         }
 
         var groupedHeaders = staticHeaders.GroupBy(h => Encoding.ASCII.GetString(h.HeaderField.Name)).Select(g =>