diff options
| author | James Newton-King <james@newtonking.com> | 2022-08-02 03:52:26 +0300 |
|---|---|---|
| committer | James Newton-King <james@newtonking.com> | 2022-08-02 03:52:26 +0300 |
| commit | 42d4c631624502f679cbbcca682681187f69f450 (patch) | |
| tree | cd8e6240b1fa27c5bee035b371b5b12508141e3d | |
| parent | 7396374dd603509158dda5980315315d67461faa (diff) | |
Make AltUsed internaljamesnk/altused
25 files changed, 1167 insertions, 1215 deletions
diff --git a/src/Http/Headers/src/HeaderNames.cs b/src/Http/Headers/src/HeaderNames.cs index 776f79b878..d5933802da 100644 --- a/src/Http/Headers/src/HeaderNames.cs +++ b/src/Http/Headers/src/HeaderNames.cs @@ -62,9 +62,6 @@ public static class HeaderNames /// <summary>Gets the <c>Alt-Svc</c> HTTP header name.</summary> public static readonly string AltSvc = "Alt-Svc"; - /// <summary>Gets the <c>Alt-Used</c> HTTP header name.</summary> - public static readonly string AltUsed = "Alt-Used"; - /// <summary>Gets the <c>:authority</c> HTTP header name.</summary> [Obsolete(PseudoHeaderNamesObsoletionMessage, false)] public static readonly string Authority = ":authority"; diff --git a/src/Http/Headers/src/PublicAPI.Unshipped.txt b/src/Http/Headers/src/PublicAPI.Unshipped.txt index 2880b3e004..7dc5c58110 100644 --- a/src/Http/Headers/src/PublicAPI.Unshipped.txt +++ b/src/Http/Headers/src/PublicAPI.Unshipped.txt @@ -1,2 +1 @@ #nullable enable -static readonly Microsoft.Net.Http.Headers.HeaderNames.AltUsed -> string! diff --git a/src/Http/Http.Features/src/IHeaderDictionary.Keyed.cs b/src/Http/Http.Features/src/IHeaderDictionary.Keyed.cs index 5dcf597489..332eac40dd 100644 --- a/src/Http/Http.Features/src/IHeaderDictionary.Keyed.cs +++ b/src/Http/Http.Features/src/IHeaderDictionary.Keyed.cs @@ -55,9 +55,6 @@ public partial interface IHeaderDictionary /// <summary>Gets or sets the <c>Alt-Svc</c> HTTP header.</summary> StringValues AltSvc { get => this[HeaderNames.AltSvc]; set => this[HeaderNames.AltSvc] = value; } - /// <summary>Gets or sets the <c>Alt-Used</c> HTTP header.</summary> - StringValues AltUsed { get => this[HeaderNames.AltUsed]; set => this[HeaderNames.AltUsed] = value; } - /// <summary>Gets or sets the <c>Authorization</c> HTTP header.</summary> StringValues Authorization { get => this[HeaderNames.Authorization]; set => this[HeaderNames.Authorization] = value; } diff --git a/src/Http/Http.Features/src/PublicAPI.Unshipped.txt b/src/Http/Http.Features/src/PublicAPI.Unshipped.txt index 2b3bb8d6c3..fe3881f254 100644 --- a/src/Http/Http.Features/src/PublicAPI.Unshipped.txt +++ b/src/Http/Http.Features/src/PublicAPI.Unshipped.txt @@ -14,5 +14,3 @@ Microsoft.AspNetCore.Http.Features.IWebTransportSession.Abort(int errorCode) -> Microsoft.AspNetCore.Http.Features.IWebTransportSession.AcceptStreamAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.ConnectionContext?> Microsoft.AspNetCore.Http.Features.IWebTransportSession.OpenUnidirectionalStreamAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.ConnectionContext?> Microsoft.AspNetCore.Http.Features.IWebTransportSession.SessionId.get -> long -Microsoft.AspNetCore.Http.IHeaderDictionary.AltUsed.get -> Microsoft.Extensions.Primitives.StringValues -Microsoft.AspNetCore.Http.IHeaderDictionary.AltUsed.set -> void diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs index 2249ebd513..38804c59d2 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs @@ -279,7 +279,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http internal partial class HttpHeaders { - private readonly static HashSet<string> _internedHeaderNames = new HashSet<string>(92, StringComparer.OrdinalIgnoreCase) + private readonly static HashSet<string> _internedHeaderNames = new HashSet<string>(91, StringComparer.OrdinalIgnoreCase) { HeaderNames.Accept, HeaderNames.AcceptCharset, @@ -297,7 +297,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http HeaderNames.Age, HeaderNames.Allow, HeaderNames.AltSvc, - HeaderNames.AltUsed, HeaderNames.Authorization, HeaderNames.Baggage, HeaderNames.CacheControl, @@ -847,34 +846,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } } } - StringValues IHeaderDictionary.AltUsed - { - get - { - var value = _headers._AltUsed; - if ((_bits & 0x4000L) != 0) - { - return value; - } - return default; - } - set - { - if (_isReadOnly) { ThrowHeadersReadOnlyException(); } - - var flag = 0x4000L; - if (value.Count > 0) - { - _bits |= flag; - _headers._AltUsed = value; - } - else - { - _bits &= ~flag; - _headers._AltUsed = default; - } - } - } StringValues IHeaderDictionary.Authorization { get @@ -2728,7 +2699,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 5: { - if (ReferenceEquals(PseudoHeaderNames.Path, key)) + if (ReferenceEquals(InternalHeaderNames.Path, key)) { if ((_bits & 0x40L) != 0) { @@ -2747,7 +2718,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Path.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Path.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x40L) != 0) { @@ -2864,7 +2835,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 7: { - if (ReferenceEquals(PseudoHeaderNames.Method, key)) + if (ReferenceEquals(InternalHeaderNames.Method, key)) { if ((_bits & 0x20L) != 0) { @@ -2873,7 +2844,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (ReferenceEquals(PseudoHeaderNames.Scheme, key)) + if (ReferenceEquals(InternalHeaderNames.Scheme, key)) { if ((_bits & 0x100L) != 0) { @@ -2919,7 +2890,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Method.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Method.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x20L) != 0) { @@ -2928,7 +2899,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (PseudoHeaderNames.Scheme.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Scheme.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x100L) != 0) { @@ -2977,7 +2948,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 8: { - if (ReferenceEquals(HeaderNames.AltUsed, key)) + if (ReferenceEquals(InternalHeaderNames.AltUsed, key)) { if ((_bits & 0x4000L) != 0) { @@ -3005,7 +2976,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (HeaderNames.AltUsed.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.AltUsed.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x4000L) != 0) { @@ -3036,7 +3007,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 9: { - if (ReferenceEquals(PseudoHeaderNames.Protocol, key)) + if (ReferenceEquals(InternalHeaderNames.Protocol, key)) { if ((_bits & 0x80L) != 0) { @@ -3055,7 +3026,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Protocol.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Protocol.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x80L) != 0) { @@ -3095,7 +3066,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (ReferenceEquals(PseudoHeaderNames.Authority, key)) + if (ReferenceEquals(InternalHeaderNames.Authority, key)) { if ((_bits & 0x10L) != 0) { @@ -3150,7 +3121,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (PseudoHeaderNames.Authority.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Authority.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x10L) != 0) { @@ -3707,7 +3678,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 5: { - if (ReferenceEquals(PseudoHeaderNames.Path, key)) + if (ReferenceEquals(InternalHeaderNames.Path, key)) { _bits |= 0x40L; _headers._Path = value; @@ -3720,7 +3691,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return; } - if (PseudoHeaderNames.Path.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Path.Equals(key, StringComparison.OrdinalIgnoreCase)) { _bits |= 0x40L; _headers._Path = value; @@ -3801,13 +3772,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 7: { - if (ReferenceEquals(PseudoHeaderNames.Method, key)) + if (ReferenceEquals(InternalHeaderNames.Method, key)) { _bits |= 0x20L; _headers._Method = value; return; } - if (ReferenceEquals(PseudoHeaderNames.Scheme, key)) + if (ReferenceEquals(InternalHeaderNames.Scheme, key)) { _bits |= 0x100L; _headers._Scheme = value; @@ -3838,13 +3809,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return; } - if (PseudoHeaderNames.Method.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Method.Equals(key, StringComparison.OrdinalIgnoreCase)) { _bits |= 0x20L; _headers._Method = value; return; } - if (PseudoHeaderNames.Scheme.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Scheme.Equals(key, StringComparison.OrdinalIgnoreCase)) { _bits |= 0x100L; _headers._Scheme = value; @@ -3878,7 +3849,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 8: { - if (ReferenceEquals(HeaderNames.AltUsed, key)) + if (ReferenceEquals(InternalHeaderNames.AltUsed, key)) { _bits |= 0x4000L; _headers._AltUsed = value; @@ -3897,7 +3868,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return; } - if (HeaderNames.AltUsed.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.AltUsed.Equals(key, StringComparison.OrdinalIgnoreCase)) { _bits |= 0x4000L; _headers._AltUsed = value; @@ -3919,7 +3890,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 9: { - if (ReferenceEquals(PseudoHeaderNames.Protocol, key)) + if (ReferenceEquals(InternalHeaderNames.Protocol, key)) { _bits |= 0x80L; _headers._Protocol = value; @@ -3932,7 +3903,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return; } - if (PseudoHeaderNames.Protocol.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Protocol.Equals(key, StringComparison.OrdinalIgnoreCase)) { _bits |= 0x80L; _headers._Protocol = value; @@ -3960,7 +3931,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http _headers._UserAgent = value; return; } - if (ReferenceEquals(PseudoHeaderNames.Authority, key)) + if (ReferenceEquals(InternalHeaderNames.Authority, key)) { _bits |= 0x10L; _headers._Authority = value; @@ -3997,7 +3968,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http _headers._UserAgent = value; return; } - if (PseudoHeaderNames.Authority.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Authority.Equals(key, StringComparison.OrdinalIgnoreCase)) { _bits |= 0x10L; _headers._Authority = value; @@ -4454,7 +4425,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 5: { - if (ReferenceEquals(PseudoHeaderNames.Path, key)) + if (ReferenceEquals(InternalHeaderNames.Path, key)) { if ((_bits & 0x40L) == 0) { @@ -4475,7 +4446,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Path.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Path.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x40L) == 0) { @@ -4604,7 +4575,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 7: { - if (ReferenceEquals(PseudoHeaderNames.Method, key)) + if (ReferenceEquals(InternalHeaderNames.Method, key)) { if ((_bits & 0x20L) == 0) { @@ -4614,7 +4585,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (ReferenceEquals(PseudoHeaderNames.Scheme, key)) + if (ReferenceEquals(InternalHeaderNames.Scheme, key)) { if ((_bits & 0x100L) == 0) { @@ -4665,7 +4636,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Method.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Method.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x20L) == 0) { @@ -4675,7 +4646,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (PseudoHeaderNames.Scheme.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Scheme.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x100L) == 0) { @@ -4729,7 +4700,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 8: { - if (ReferenceEquals(HeaderNames.AltUsed, key)) + if (ReferenceEquals(InternalHeaderNames.AltUsed, key)) { if ((_bits & 0x4000L) == 0) { @@ -4760,7 +4731,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (HeaderNames.AltUsed.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.AltUsed.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x4000L) == 0) { @@ -4794,7 +4765,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 9: { - if (ReferenceEquals(PseudoHeaderNames.Protocol, key)) + if (ReferenceEquals(InternalHeaderNames.Protocol, key)) { if ((_bits & 0x80L) == 0) { @@ -4815,7 +4786,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Protocol.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Protocol.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x80L) == 0) { @@ -4859,7 +4830,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (ReferenceEquals(PseudoHeaderNames.Authority, key)) + if (ReferenceEquals(InternalHeaderNames.Authority, key)) { if ((_bits & 0x10L) == 0) { @@ -4920,7 +4891,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (PseudoHeaderNames.Authority.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Authority.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x10L) == 0) { @@ -5561,7 +5532,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 5: { - if (ReferenceEquals(PseudoHeaderNames.Path, key)) + if (ReferenceEquals(InternalHeaderNames.Path, key)) { if ((_bits & 0x40L) != 0) { @@ -5582,7 +5553,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Path.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Path.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x40L) != 0) { @@ -5711,7 +5682,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 7: { - if (ReferenceEquals(PseudoHeaderNames.Method, key)) + if (ReferenceEquals(InternalHeaderNames.Method, key)) { if ((_bits & 0x20L) != 0) { @@ -5721,7 +5692,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (ReferenceEquals(PseudoHeaderNames.Scheme, key)) + if (ReferenceEquals(InternalHeaderNames.Scheme, key)) { if ((_bits & 0x100L) != 0) { @@ -5772,7 +5743,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Method.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Method.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x20L) != 0) { @@ -5782,7 +5753,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (PseudoHeaderNames.Scheme.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Scheme.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x100L) != 0) { @@ -5836,7 +5807,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 8: { - if (ReferenceEquals(HeaderNames.AltUsed, key)) + if (ReferenceEquals(InternalHeaderNames.AltUsed, key)) { if ((_bits & 0x4000L) != 0) { @@ -5867,7 +5838,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (HeaderNames.AltUsed.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.AltUsed.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x4000L) != 0) { @@ -5901,7 +5872,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } case 9: { - if (ReferenceEquals(PseudoHeaderNames.Protocol, key)) + if (ReferenceEquals(InternalHeaderNames.Protocol, key)) { if ((_bits & 0x80L) != 0) { @@ -5922,7 +5893,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return false; } - if (PseudoHeaderNames.Protocol.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Protocol.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x80L) != 0) { @@ -5966,7 +5937,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (ReferenceEquals(PseudoHeaderNames.Authority, key)) + if (ReferenceEquals(InternalHeaderNames.Authority, key)) { if ((_bits & 0x10L) != 0) { @@ -6027,7 +5998,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } - if (PseudoHeaderNames.Authority.Equals(key, StringComparison.OrdinalIgnoreCase)) + if (InternalHeaderNames.Authority.Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x10L) != 0) { @@ -7091,7 +7062,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return false; } - array[arrayIndex] = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Authority, _headers._Authority); + array[arrayIndex] = new KeyValuePair<string, StringValues>(InternalHeaderNames.Authority, _headers._Authority); ++arrayIndex; } if ((_bits & 0x20L) != 0) @@ -7100,7 +7071,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return false; } - array[arrayIndex] = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Method, _headers._Method); + array[arrayIndex] = new KeyValuePair<string, StringValues>(InternalHeaderNames.Method, _headers._Method); ++arrayIndex; } if ((_bits & 0x40L) != 0) @@ -7109,7 +7080,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return false; } - array[arrayIndex] = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Path, _headers._Path); + array[arrayIndex] = new KeyValuePair<string, StringValues>(InternalHeaderNames.Path, _headers._Path); ++arrayIndex; } if ((_bits & 0x80L) != 0) @@ -7118,7 +7089,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return false; } - array[arrayIndex] = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Protocol, _headers._Protocol); + array[arrayIndex] = new KeyValuePair<string, StringValues>(InternalHeaderNames.Protocol, _headers._Protocol); ++arrayIndex; } if ((_bits & 0x100L) != 0) @@ -7127,7 +7098,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return false; } - array[arrayIndex] = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Scheme, _headers._Scheme); + array[arrayIndex] = new KeyValuePair<string, StringValues>(InternalHeaderNames.Scheme, _headers._Scheme); ++arrayIndex; } if ((_bits & 0x200L) != 0) @@ -7181,7 +7152,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return false; } - array[arrayIndex] = new KeyValuePair<string, StringValues>(HeaderNames.AltUsed, _headers._AltUsed); + array[arrayIndex] = new KeyValuePair<string, StringValues>(InternalHeaderNames.AltUsed, _headers._AltUsed); ++arrayIndex; } if ((_bits & 0x8000L) != 0) @@ -7593,7 +7564,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { flag = 0x40L; values = ref _headers._Path; - nameStr = PseudoHeaderNames.Path; + nameStr = InternalHeaderNames.Path; } else if (((ReadUnalignedLittleEndian_uint(ref nameStart) & 0xdfdfdfdfu) == 0x474e4152u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)4) & 0xdfu) == 0x45u)) { @@ -7640,13 +7611,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { flag = 0x20L; values = ref _headers._Method; - nameStr = PseudoHeaderNames.Method; + nameStr = InternalHeaderNames.Method; } else if (((ReadUnalignedLittleEndian_uint(ref nameStart) & 0xdfdfdfffu) == 0x4843533au) && ((ReadUnalignedLittleEndian_ushort(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x4d45u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)6) & 0xdfu) == 0x45u)) { flag = 0x100L; values = ref _headers._Scheme; - nameStr = PseudoHeaderNames.Scheme; + nameStr = InternalHeaderNames.Scheme; } else if (((ReadUnalignedLittleEndian_uint(ref nameStart) & 0xdfdfdfdfu) == 0x47474142u) && ((ReadUnalignedLittleEndian_ushort(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x4741u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)6) & 0xdfu) == 0x45u)) { @@ -7678,7 +7649,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { flag = 0x4000L; values = ref _headers._AltUsed; - nameStr = HeaderNames.AltUsed; + nameStr = InternalHeaderNames.AltUsed; } else if (((ReadUnalignedLittleEndian_ulong(ref nameStart) & 0xdfdfdfdfdfffdfdfuL) == 0x484354414d2d4649uL)) { @@ -7698,7 +7669,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { flag = 0x80L; values = ref _headers._Protocol; - nameStr = PseudoHeaderNames.Protocol; + nameStr = InternalHeaderNames.Protocol; } else if (((ReadUnalignedLittleEndian_ulong(ref nameStart) & 0xdfdfdfdfdfdfdfdfuL) == 0x54414c534e415254uL) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)8) & 0xdfu) == 0x45u)) { @@ -7724,7 +7695,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { flag = 0x10L; values = ref _headers._Authority; - nameStr = PseudoHeaderNames.Authority; + nameStr = InternalHeaderNames.Authority; } else if (((ReadUnalignedLittleEndian_ulong(ref nameStart) & 0xdfdfdfffdfdfdfdfuL) == 0x494c412d5045454buL) && ((ReadUnalignedLittleEndian_ushort(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(4 * sizeof(ushort)))) & 0xdfdfu) == 0x4556u)) { @@ -7966,25 +7937,25 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http case 1: flag = 0x10L; values = ref _headers._Authority; - nameStr = PseudoHeaderNames.Authority; + nameStr = InternalHeaderNames.Authority; break; case 2: case 3: flag = 0x20L; values = ref _headers._Method; - nameStr = PseudoHeaderNames.Method; + nameStr = InternalHeaderNames.Method; break; case 4: case 5: flag = 0x40L; values = ref _headers._Path; - nameStr = PseudoHeaderNames.Path; + nameStr = InternalHeaderNames.Path; break; case 6: case 7: flag = 0x100L; values = ref _headers._Scheme; - nameStr = PseudoHeaderNames.Scheme; + nameStr = InternalHeaderNames.Scheme; break; case 15: flag = 0x200L; @@ -8178,12 +8149,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http case 0: flag = 0x10L; values = ref _headers._Authority; - nameStr = PseudoHeaderNames.Authority; + nameStr = InternalHeaderNames.Authority; break; case 1: flag = 0x40L; values = ref _headers._Path; - nameStr = PseudoHeaderNames.Path; + nameStr = InternalHeaderNames.Path; break; case 4: var customEncoding = ReferenceEquals(EncodingSelector, KestrelServerOptions.DefaultHeaderEncodingSelector) @@ -8231,13 +8202,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http case 21: flag = 0x20L; values = ref _headers._Method; - nameStr = PseudoHeaderNames.Method; + nameStr = InternalHeaderNames.Method; break; case 22: case 23: flag = 0x100L; values = ref _headers._Scheme; - nameStr = PseudoHeaderNames.Scheme; + nameStr = InternalHeaderNames.Scheme; break; case 29: case 30: @@ -8451,27 +8422,27 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http break; case 4: // Header: ":authority" Debug.Assert((_currentBits & 0x10L) != 0); - _current = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Authority, _collection._headers._Authority); + _current = new KeyValuePair<string, StringValues>(InternalHeaderNames.Authority, _collection._headers._Authority); _currentBits ^= 0x10L; break; case 5: // Header: ":method" Debug.Assert((_currentBits & 0x20L) != 0); - _current = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Method, _collection._headers._Method); + _current = new KeyValuePair<string, StringValues>(InternalHeaderNames.Method, _collection._headers._Method); _currentBits ^= 0x20L; break; case 6: // Header: ":path" Debug.Assert((_currentBits & 0x40L) != 0); - _current = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Path, _collection._headers._Path); + _current = new KeyValuePair<string, StringValues>(InternalHeaderNames.Path, _collection._headers._Path); _currentBits ^= 0x40L; break; case 7: // Header: ":protocol" Debug.Assert((_currentBits & 0x80L) != 0); - _current = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Protocol, _collection._headers._Protocol); + _current = new KeyValuePair<string, StringValues>(InternalHeaderNames.Protocol, _collection._headers._Protocol); _currentBits ^= 0x80L; break; case 8: // Header: ":scheme" Debug.Assert((_currentBits & 0x100L) != 0); - _current = new KeyValuePair<string, StringValues>(PseudoHeaderNames.Scheme, _collection._headers._Scheme); + _current = new KeyValuePair<string, StringValues>(InternalHeaderNames.Scheme, _collection._headers._Scheme); _currentBits ^= 0x100L; break; case 9: // Header: "Accept-Charset" @@ -8501,7 +8472,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http break; case 14: // Header: "Alt-Used" Debug.Assert((_currentBits & 0x4000L) != 0); - _current = new KeyValuePair<string, StringValues>(HeaderNames.AltUsed, _collection._headers._AltUsed); + _current = new KeyValuePair<string, StringValues>(InternalHeaderNames.AltUsed, _collection._headers._AltUsed); _currentBits ^= 0x4000L; break; case 15: // Header: "Authorization" @@ -10050,24 +10021,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http SetValueUnknown(HeaderNames.AccessControlRequestMethod, value); } } - StringValues IHeaderDictionary.AltUsed - { - get - { - StringValues value = default; - if (!TryGetUnknown(HeaderNames.AltUsed, ref value)) - { - value = default; - } - return value; - } - set - { - if (_isReadOnly) { ThrowHeadersReadOnlyException(); } - ValidateHeaderValueCharacters(HeaderNames.AltUsed, value, EncodingSelector); - SetValueUnknown(HeaderNames.AltUsed, value); - } - } StringValues IHeaderDictionary.Authorization { get @@ -15938,24 +15891,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http SetValueUnknown(HeaderNames.AltSvc, value); } } - StringValues IHeaderDictionary.AltUsed - { - get - { - StringValues value = default; - if (!TryGetUnknown(HeaderNames.AltUsed, ref value)) - { - value = default; - } - return value; - } - set - { - if (_isReadOnly) { ThrowHeadersReadOnlyException(); } - ValidateHeaderValueCharacters(HeaderNames.AltUsed, value, EncodingSelector); - SetValueUnknown(HeaderNames.AltUsed, value); - } - } StringValues IHeaderDictionary.Authorization { get diff --git a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index 1e2dda0405..cf77ba81c0 100644 --- a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -22,7 +22,7 @@ <Compile Include="$(SharedSourceRoot)CertificateGeneration\**\*.cs" /> <Compile Include="$(SharedSourceRoot)ValueTaskExtensions\**\*.cs" /> <Compile Include="$(SharedSourceRoot)UrlDecoder\**\*.cs" /> - <Compile Include="$(SharedSourceRoot)PseudoHeaderNames.cs" Link="Shared\PseudoHeaderNames.cs"/> + <Compile Include="$(SharedSourceRoot)InternalHeaderNames.cs" Link="Shared\InternalHeaderNames.cs"/> <Compile Include="$(SharedSourceRoot)Buffers\**\*.cs" LinkBase="Internal\Infrastructure\PipeWriterHelpers" /> <Compile Include="$(SharedSourceRoot)runtime\*.cs" Link="Shared\runtime\%(Filename)%(Extension)" /> <Compile Include="$(SharedSourceRoot)runtime\Http2\**\*.cs" Link="Shared\runtime\Http2\%(Filename)%(Extension)" /> diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs index 2d04f7080d..010d738541 100644 --- a/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http2/Http2ConnectionBenchmarkBase.cs @@ -48,10 +48,10 @@ public abstract class Http2ConnectionBenchmarkBase _connectionPair = DuplexPipe.CreateConnectionPair(options, options); _httpRequestHeaders = new HttpRequestHeaders(); - _httpRequestHeaders[PseudoHeaderNames.Method] = new StringValues("GET"); - _httpRequestHeaders[PseudoHeaderNames.Path] = new StringValues("/"); - _httpRequestHeaders[PseudoHeaderNames.Scheme] = new StringValues("http"); - _httpRequestHeaders[PseudoHeaderNames.Authority] = new StringValues("localhost:80"); + _httpRequestHeaders[InternalHeaderNames.Method] = new StringValues("GET"); + _httpRequestHeaders[InternalHeaderNames.Path] = new StringValues("/"); + _httpRequestHeaders[InternalHeaderNames.Scheme] = new StringValues("http"); + _httpRequestHeaders[InternalHeaderNames.Authority] = new StringValues("localhost:80"); if (NumCookies > 0) { diff --git a/src/Servers/Kestrel/perf/Microbenchmarks/Http3/Http3ConnectionBenchmarkBase.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http3/Http3ConnectionBenchmarkBase.cs index f2abd7a001..9d1b828363 100644 --- a/src/Servers/Kestrel/perf/Microbenchmarks/Http3/Http3ConnectionBenchmarkBase.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http3/Http3ConnectionBenchmarkBase.cs @@ -47,10 +47,10 @@ public abstract class Http3ConnectionBenchmarkBase _httpFrame = new Http3FrameWithPayload(); _httpRequestHeaders = new HttpRequestHeaders(); - _httpRequestHeaders[PseudoHeaderNames.Method] = new StringValues("GET"); - _httpRequestHeaders[PseudoHeaderNames.Path] = new StringValues("/"); - _httpRequestHeaders[PseudoHeaderNames.Scheme] = new StringValues("http"); - _httpRequestHeaders[PseudoHeaderNames.Authority] = new StringValues("localhost:80"); + _httpRequestHeaders[InternalHeaderNames.Method] = new StringValues("GET"); + _httpRequestHeaders[InternalHeaderNames.Path] = new StringValues("/"); + _httpRequestHeaders[InternalHeaderNames.Scheme] = new StringValues("http"); + _httpRequestHeaders[InternalHeaderNames.Authority] = new StringValues("localhost:80"); var serviceContext = TestContextFactory.CreateServiceContext( serverOptions: new KestrelServerOptions(), diff --git a/src/Servers/Kestrel/samples/http2cat/http2cat.csproj b/src/Servers/Kestrel/samples/http2cat/http2cat.csproj index b6d82cbf42..6947c48b1a 100644 --- a/src/Servers/Kestrel/samples/http2cat/http2cat.csproj +++ b/src/Servers/Kestrel/samples/http2cat/http2cat.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>Exe</OutputType> @@ -14,7 +14,7 @@ <Compile Include="$(SharedSourceRoot)ServerInfrastructure\**\*.cs" LinkBase="Shared\" /> <Compile Remove="$(SharedSourceRoot)ServerInfrastructure\DuplexPipe.cs" /> <Compile Include="$(SharedSourceRoot)TaskToApm.cs" Link="Shared\TaskToApm.cs" /> - <Compile Include="$(SharedSourceRoot)PseudoHeaderNames.cs" Link="PseudoHeaderNames.cs" /> + <Compile Include="$(SharedSourceRoot)InternalHeaderNames.cs" Link="InternalHeaderNames.cs" /> <Compile Include="$(SharedSourceRoot)ValueTaskExtensions\**\*.cs" /> </ItemGroup> diff --git a/src/Servers/Kestrel/shared/KnownHeaders.cs b/src/Servers/Kestrel/shared/KnownHeaders.cs index bab81431f4..d93762f184 100644 --- a/src/Servers/Kestrel/shared/KnownHeaders.cs +++ b/src/Servers/Kestrel/shared/KnownHeaders.cs @@ -26,11 +26,11 @@ public class KnownHeaders HeaderNames.TransferEncoding, HeaderNames.ContentLength, HeaderNames.Connection, - PseudoHeaderNames.Scheme, - PseudoHeaderNames.Path, - PseudoHeaderNames.Protocol, - PseudoHeaderNames.Method, - PseudoHeaderNames.Authority, + InternalHeaderNames.Scheme, + InternalHeaderNames.Path, + InternalHeaderNames.Protocol, + InternalHeaderNames.Method, + InternalHeaderNames.Authority, HeaderNames.Host, }; @@ -40,24 +40,29 @@ public class KnownHeaders .Select(h => h.Name) .ToArray(); - public static readonly string[] ObsoleteHeaderNames = new[] + // These headers are excluded from generated IHeadersDictionary implementaiton. + public static readonly string[] NonPublicHeaderNames = new[] { HeaderNames.DNT, + InternalHeaderNames.AltUsed }; - public static readonly (string, string)[] FormattedPseudoHeaderNames = new[] + public record InternalHeader(string Identifier, string Name, bool IsPseudoHeader = false); + + public static readonly InternalHeader[] FormattedInternalHeaderNames = new[] { - ("Authority", PseudoHeaderNames.Authority), - ("Method", PseudoHeaderNames.Method), - ("Path", PseudoHeaderNames.Path), - ("Scheme", PseudoHeaderNames.Scheme), - ("Status", PseudoHeaderNames.Status), - ("Protocol", PseudoHeaderNames.Protocol) + new InternalHeader("Authority", InternalHeaderNames.Authority, IsPseudoHeader: true), + new InternalHeader("Method", InternalHeaderNames.Method, IsPseudoHeader: true), + new InternalHeader("Path", InternalHeaderNames.Path, IsPseudoHeader: true), + new InternalHeader("Scheme", InternalHeaderNames.Scheme, IsPseudoHeader: true), + new InternalHeader("Status", InternalHeaderNames.Status, IsPseudoHeader: true), + new InternalHeader("Protocol", InternalHeaderNames.Protocol, IsPseudoHeader: true), + new InternalHeader("AltUsed", InternalHeaderNames.AltUsed) }; public static readonly string[] NonApiHeaders = - ObsoleteHeaderNames - .Concat(FormattedPseudoHeaderNames.Select(x => x.Item1)) + NonPublicHeaderNames + .Concat(FormattedInternalHeaderNames.Select(x => x.Identifier)) .ToArray(); public static readonly string[] ApiHeaderNames = @@ -118,15 +123,15 @@ public class KnownHeaders }; RequestHeaders = commonHeaders.Concat(new[] { - PseudoHeaderNames.Authority, - PseudoHeaderNames.Method, - PseudoHeaderNames.Path, - PseudoHeaderNames.Scheme, + InternalHeaderNames.Authority, + InternalHeaderNames.Method, + InternalHeaderNames.Path, + InternalHeaderNames.Scheme, HeaderNames.Accept, HeaderNames.AcceptCharset, HeaderNames.AcceptEncoding, HeaderNames.AcceptLanguage, - HeaderNames.AltUsed, + InternalHeaderNames.AltUsed, HeaderNames.Authorization, HeaderNames.Cookie, HeaderNames.Expect, @@ -140,7 +145,7 @@ public class KnownHeaders HeaderNames.IfRange, HeaderNames.IfUnmodifiedSince, HeaderNames.MaxForwards, - PseudoHeaderNames.Protocol, + InternalHeaderNames.Protocol, HeaderNames.ProxyAuthorization, HeaderNames.Referer, HeaderNames.Range, @@ -159,12 +164,12 @@ public class KnownHeaders .ThenBy(header => header) .Select((header, index) => new KnownHeader { - ClassName = FormattedPseudoHeaderNames.Select(x => x.Item2).Contains(header) ? "PseudoHeaderNames" : "HeaderNames", + ClassName = FormattedInternalHeaderNames.Select(x => x.Name).Contains(header) ? "InternalHeaderNames" : "HeaderNames", Name = header, Index = index, PrimaryHeader = requestPrimaryHeaders.Contains(header), ExistenceCheck = requestHeadersExistence.Contains(header), - FastCount = requestHeadersCount.Contains(header) + FastCount = requestHeadersCount.Contains(header), }) .Concat(new[] { new KnownHeader { @@ -230,7 +235,7 @@ public class KnownHeaders .ThenBy(header => header) .Select((header, index) => new KnownHeader { - ClassName = FormattedPseudoHeaderNames.Select(x => x.Item2).Contains(header) ? "PseudoHeaderNames" : "HeaderNames", + ClassName = FormattedInternalHeaderNames.Select(x => x.Name).Contains(header) ? "InternalHeaderNames" : "HeaderNames", Name = header, Index = index, EnhancedSetter = enhancedHeaders.Contains(header), @@ -257,7 +262,7 @@ public class KnownHeaders .ThenBy(header => header) .Select((header, index) => new KnownHeader { - ClassName = FormattedPseudoHeaderNames.Select(x => x.Item2).Contains(header) ? "PseudoHeaderNames" : "HeaderNames", + ClassName = FormattedInternalHeaderNames.Select(x => x.Name).Contains(header) ? "InternalHeaderNames" : "HeaderNames", Name = header, Index = index, EnhancedSetter = enhancedHeaders.Contains(header), @@ -281,7 +286,7 @@ public class KnownHeaders .Aggregate((a, b) => a | b); PseudoRequestHeadersBits = RequestHeaders - .Where(header => FormattedPseudoHeaderNames.Select(x => x.Item1).Contains(header.Identifier)) + .Where(header => FormattedInternalHeaderNames.Where(x => x.IsPseudoHeader).Select(x => x.Identifier).Contains(header.Identifier)) .Select(header => 1L << header.Index) .Aggregate((a, b) => a | b); } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs index 142906c272..cc5a8b7753 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs @@ -165,10 +165,10 @@ public class Http2ConnectionTests : Http2TestBase { IEnumerable<KeyValuePair<string, string>> requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentType, "application/json") }; @@ -216,20 +216,20 @@ public class Http2ConnectionTests : Http2TestBase IEnumerable<KeyValuePair<string, string>> requestHeaders1 = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentType, "application/json") }; // Note: No content-type IEnumerable<KeyValuePair<string, string>> requestHeaders2 = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80") + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80") }; await InitializeConnectionAsync(_noopApplication); @@ -309,10 +309,10 @@ public class Http2ConnectionTests : Http2TestBase { IEnumerable<KeyValuePair<string, string>> requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentType, "application/json") }; @@ -2632,9 +2632,9 @@ public class Http2ConnectionTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(":unknown", "0"), }; @@ -2646,10 +2646,10 @@ public class Http2ConnectionTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Status, "200"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Status, "200"), }; return HEADERS_Received_InvalidHeaderFields_ConnectionError(headers, expectedErrorMessage: CoreStrings.HttpErrorResponsePseudoHeaderField); @@ -2723,9 +2723,9 @@ public class Http2ConnectionTests : Http2TestBase // > 32kb var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("a", _4kHeaderValue), new KeyValuePair<string, string>("b", _4kHeaderValue), new KeyValuePair<string, string>("c", _4kHeaderValue), @@ -2746,9 +2746,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new List<KeyValuePair<string, string>>(); headers.AddRange(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }); for (var i = 0; i < 100; i++) { @@ -2763,9 +2763,9 @@ public class Http2ConnectionTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("Custom", "val\0ue"), }; @@ -2777,9 +2777,9 @@ public class Http2ConnectionTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("connection", "keep-alive") }; @@ -2791,9 +2791,9 @@ public class Http2ConnectionTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("te", "trailers, deflate") }; @@ -2805,9 +2805,9 @@ public class Http2ConnectionTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("te", "trailers") }; @@ -2828,9 +2828,9 @@ public class Http2ConnectionTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, new string('A', 8192 / 2)), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/" + new string('A', 8192 / 2)), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http") + new KeyValuePair<string, string>(InternalHeaderNames.Method, new string('A', 8192 / 2)), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/" + new string('A', 8192 / 2)), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http") }; await InitializeConnectionAsync(_noopApplication); @@ -2846,9 +2846,9 @@ public class Http2ConnectionTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.Cookie, "a=0"), new KeyValuePair<string, string>(HeaderNames.Cookie, "b=1"), new KeyValuePair<string, string>(HeaderNames.Cookie, "c=2"), @@ -3263,9 +3263,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(context => tcs.Task); @@ -3287,9 +3287,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(context => tcs.Task); @@ -3311,9 +3311,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(context => tcs.Task); @@ -3333,9 +3333,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(context => tcs.Task); @@ -4609,7 +4609,7 @@ public class Http2ConnectionTests : Http2TestBase Assert.Equal(11, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders["content-length"]); Assert.Equal(_4kHeaderValue, _decodedHeaders["a"]); Assert.Equal(_4kHeaderValue, _decodedHeaders["b"]); @@ -4926,9 +4926,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(_noopApplication); @@ -4977,9 +4977,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(_appAbort); @@ -5021,9 +5021,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(_appReset); @@ -5091,9 +5091,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await StartStreamAsync(1, headers, endStream: false); @@ -5171,9 +5171,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; // This mimics gRPC, sending headers and data close together before receiving a reset. @@ -5222,9 +5222,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => @@ -5262,9 +5262,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(_appAbort); @@ -5336,9 +5336,9 @@ public class Http2ConnectionTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(_appAbort); @@ -5484,10 +5484,10 @@ public class Http2ConnectionTests : Http2TestBase var data = new TheoryData<IEnumerable<KeyValuePair<string, string>>>(); var requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "127.0.0.1"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "127.0.0.1"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; foreach (var headerField in requestHeaders) @@ -5507,9 +5507,9 @@ public class Http2ConnectionTests : Http2TestBase var data = new TheoryData<IEnumerable<KeyValuePair<string, string>>>(); var requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; foreach (var headerField in requestHeaders) @@ -5527,7 +5527,7 @@ public class Http2ConnectionTests : Http2TestBase get { var data = new TheoryData<IEnumerable<KeyValuePair<string, string>>>(); - var methodHeader = new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"); + var methodHeader = new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"); var headers = new[] { methodHeader }; data.Add(headers); @@ -5542,10 +5542,10 @@ public class Http2ConnectionTests : Http2TestBase var data = new TheoryData<IEnumerable<KeyValuePair<string, string>>>(); var requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "127.0.0.1"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "127.0.0.1"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("content-length", "0") }; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs index 4a6f48b7c0..0618a3ccc2 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs @@ -34,10 +34,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("TestHeader", headerValue), }; await InitializeConnectionAsync(_noopApplication); @@ -52,10 +52,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, ""), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, ""), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; await InitializeConnectionAsync(_noopApplication); @@ -71,10 +71,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Hello,World"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Hello,World"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; await InitializeConnectionAsync(_noopApplication); @@ -96,10 +96,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, method), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, method), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; await InitializeConnectionAsync(_echoMethodNoBody); @@ -115,7 +115,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(4, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.Equal(method, _decodedHeaders["Method"]); _decodedHeaders.Clear(); @@ -134,7 +134,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(4, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.Equal(method, _decodedHeaders["Method"]); _decodedHeaders.Clear(); @@ -147,10 +147,10 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "HEAD"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "HEAD"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); @@ -165,7 +165,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("HEAD", _decodedHeaders["Method"]); } @@ -180,10 +180,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, method), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, method), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "11"), }; await InitializeConnectionAsync(context => @@ -217,7 +217,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(dataFrame.Payload.Span)); } @@ -232,10 +232,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, method), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, method), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; await InitializeConnectionAsync(context => { @@ -268,7 +268,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(dataFrame.Payload.Span)); } @@ -278,7 +278,7 @@ public class Http2StreamTests : Http2TestBase await InitializeConnectionAsync(_echoMethodNoBody); // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT") }; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT") }; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); var headersFrame = await ExpectAsync(Http2FrameType.HEADERS, @@ -292,7 +292,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(4, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("CONNECT", _decodedHeaders["Method"]); Assert.Equal("0", _decodedHeaders["content-length"]); } @@ -303,9 +303,9 @@ public class Http2StreamTests : Http2TestBase await InitializeConnectionAsync(_echoPath); // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "OPTIONS"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "*")}; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "OPTIONS"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "*")}; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); var headersFrame = await ExpectAsync(Http2FrameType.HEADERS, @@ -319,7 +319,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(5, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("", _decodedHeaders["path"]); Assert.Equal("*", _decodedHeaders["rawtarget"]); Assert.Equal("0", _decodedHeaders["content-length"]); @@ -331,9 +331,9 @@ public class Http2StreamTests : Http2TestBase await InitializeConnectionAsync(_echoPath); // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "OPTIONS"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/")}; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "OPTIONS"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/")}; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); var headersFrame = await ExpectAsync(Http2FrameType.HEADERS, @@ -347,7 +347,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(5, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("/", _decodedHeaders["path"]); Assert.Equal("/", _decodedHeaders["rawtarget"]); Assert.Equal("0", _decodedHeaders["content-length"]); @@ -365,9 +365,9 @@ public class Http2StreamTests : Http2TestBase }); // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/a/path?a&que%35ry")}; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/a/path?a&que%35ry")}; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); var headersFrame = await ExpectAsync(Http2FrameType.HEADERS, @@ -381,7 +381,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(6, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("/a/path", _decodedHeaders["path"]); Assert.Equal("?a&que%35ry", _decodedHeaders["query"]); Assert.Equal("/a/path?a&que%35ry", _decodedHeaders["rawtarget"]); @@ -407,9 +407,9 @@ public class Http2StreamTests : Http2TestBase }); // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, input)}; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, input)}; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); var headersFrame = await ExpectAsync(Http2FrameType.HEADERS, @@ -423,7 +423,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders["content-length"]); } @@ -435,7 +435,7 @@ public class Http2StreamTests : Http2TestBase await InitializeConnectionAsync(_noopApplication); // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), new KeyValuePair<string, string>(headerName, value) }; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); @@ -451,9 +451,9 @@ public class Http2StreamTests : Http2TestBase { await InitializeConnectionAsync(_noopApplication); - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, scheme) }; // Not the expected "http" + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, scheme) }; // Not the expected "http" await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); await WaitForStreamErrorAsync(expectedStreamId: 1, Http2ErrorCode.PROTOCOL_ERROR, @@ -472,13 +472,13 @@ public class Http2StreamTests : Http2TestBase await InitializeConnectionAsync(context => { Assert.Equal(scheme, context.Request.Scheme); - Assert.False(context.Request.Headers.ContainsKey(PseudoHeaderNames.Scheme)); + Assert.False(context.Request.Headers.ContainsKey(InternalHeaderNames.Scheme)); return Task.CompletedTask; }); - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, scheme) }; // Not the expected "http" + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, scheme) }; // Not the expected "http" await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); var headersFrame = await ExpectAsync(Http2FrameType.HEADERS, @@ -492,7 +492,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -505,9 +505,9 @@ public class Http2StreamTests : Http2TestBase await InitializeConnectionAsync(_noopApplication); - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, scheme) }; // Not the expected "http" + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, scheme) }; // Not the expected "http" await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); await WaitForStreamErrorAsync(expectedStreamId: 1, Http2ErrorCode.PROTOCOL_ERROR, @@ -521,9 +521,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(_noopApplication); @@ -540,7 +540,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders["content-length"]); } @@ -549,10 +549,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, ""), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, ""), }; await InitializeConnectionAsync(_noopApplication); @@ -569,7 +569,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders["content-length"]); } @@ -578,9 +578,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("Host", "abc"), }; await InitializeConnectionAsync(_echoHost); @@ -598,7 +598,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(4, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.Equal("abc", _decodedHeaders[HeaderNames.Host]); } @@ -608,10 +608,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, ""), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, ""), new KeyValuePair<string, string>("Host", "abc"), }; await InitializeConnectionAsync(_echoHost); @@ -629,7 +629,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(4, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.Equal("abc", _decodedHeaders[HeaderNames.Host]); } @@ -639,10 +639,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "def"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "def"), new KeyValuePair<string, string>("Host", "abc"), }; await InitializeConnectionAsync(_echoHost); @@ -660,7 +660,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(4, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.Equal("def", _decodedHeaders[HeaderNames.Host]); } @@ -670,10 +670,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "def"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "def"), new KeyValuePair<string, string>("Host", "a=bc"), }; await InitializeConnectionAsync(_echoHost); @@ -691,7 +691,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(4, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.Equal("def", _decodedHeaders[HeaderNames.Host]); } @@ -701,10 +701,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "local=host:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "local=host:80"), }; await InitializeConnectionAsync(_noopApplication); @@ -721,10 +721,10 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "d=ef"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "d=ef"), new KeyValuePair<string, string>("Host", "abc"), }; await InitializeConnectionAsync(_echoHost); @@ -742,9 +742,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("Host", "host1"), new KeyValuePair<string, string>("Host", "host2"), }; @@ -766,10 +766,10 @@ public class Http2StreamTests : Http2TestBase // https://github.com/aspnet/KestrelHttpServer/issues/2872 var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET" + new string('a', 1024 * 3)), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/Hello/How/Are/You/" + new string('a', 1024 * 3)), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost" + new string('a', 1024 * 3) + ":80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET" + new string('a', 1024 * 3)), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/Hello/How/Are/You/" + new string('a', 1024 * 3)), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost" + new string('a', 1024 * 3) + ":80"), }; await InitializeConnectionAsync(_noopApplication); @@ -785,9 +785,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -813,7 +813,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -831,9 +831,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("a", _4kHeaderValue), new KeyValuePair<string, string>("b", _4kHeaderValue), new KeyValuePair<string, string>("c", _4kHeaderValue), @@ -854,7 +854,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -863,9 +863,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -897,7 +897,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -906,9 +906,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -940,7 +940,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -950,9 +950,9 @@ public class Http2StreamTests : Http2TestBase var tcs = new TaskCompletionSource(); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -993,7 +993,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1002,9 +1002,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; @@ -1031,9 +1031,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("a", _4kHeaderValue), new KeyValuePair<string, string>("b", _4kHeaderValue), new KeyValuePair<string, string>("c", _4kHeaderValue), @@ -1056,9 +1056,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -1091,9 +1091,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -1126,9 +1126,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -1162,9 +1162,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -1212,9 +1212,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("a", _4kHeaderValue), new KeyValuePair<string, string>("b", _4kHeaderValue), new KeyValuePair<string, string>("c", _4kHeaderValue), @@ -1235,7 +1235,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1244,9 +1244,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1273,7 +1273,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("11", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1282,9 +1282,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1312,7 +1312,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("11", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1321,9 +1321,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(context => { @@ -1346,7 +1346,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("500", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("500", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1355,9 +1355,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1381,7 +1381,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -1389,9 +1389,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1416,7 +1416,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1427,9 +1427,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1456,7 +1456,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -1465,9 +1465,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1492,7 +1492,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -1502,9 +1502,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1540,7 +1540,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.True(_helloWorldBytes.AsSpan().SequenceEqual(dataFrame.PayloadSequence.ToArray())); } @@ -1550,9 +1550,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1580,7 +1580,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -1589,9 +1589,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1617,7 +1617,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1626,9 +1626,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1659,7 +1659,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.True(_helloWorldBytes.AsSpan().SequenceEqual(dataFrame.PayloadSequence.ToArray())); } @@ -1669,9 +1669,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1695,7 +1695,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("11", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1704,9 +1704,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1729,7 +1729,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -1737,9 +1737,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(context => { @@ -1766,7 +1766,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("11", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1776,9 +1776,9 @@ public class Http2StreamTests : Http2TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 15; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -1804,7 +1804,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1817,9 +1817,9 @@ public class Http2StreamTests : Http2TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 10; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; await InitializeConnectionAsync(async context => @@ -1851,7 +1851,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("413", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("413", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.NotNull(exception); @@ -1863,9 +1863,9 @@ public class Http2StreamTests : Http2TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 15; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1890,7 +1890,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -1903,9 +1903,9 @@ public class Http2StreamTests : Http2TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 10; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -1938,7 +1938,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("413", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("413", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.NotNull(exception); @@ -1955,9 +1955,9 @@ public class Http2StreamTests : Http2TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 20; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; if (includeContentLength) { @@ -2001,7 +2001,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("413", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("413", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); Assert.NotNull(exception); @@ -2015,9 +2015,9 @@ public class Http2StreamTests : Http2TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 10; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; if (includeContentLength) { @@ -2052,7 +2052,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -2091,7 +2091,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -2132,7 +2132,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(4, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Custom ä½ å¥½ Type", _decodedHeaders[HeaderNames.ContentType]); Assert.Equal("Custom ä½ å¥½ Value", _decodedHeaders["CustomName"]); } @@ -2182,7 +2182,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); _decodedHeaders.Clear(); @@ -2215,7 +2215,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("500", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("500", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -2303,7 +2303,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); _decodedHeaders.Clear(); @@ -2358,7 +2358,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); _decodedHeaders.Clear(); @@ -2416,7 +2416,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -2459,7 +2459,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); _decodedHeaders.Clear(); @@ -2500,7 +2500,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); await WaitForConnectionErrorAsync<Exception>(ignoreNonGoAwayFrames: false, int.MaxValue, Http2ErrorCode.INTERNAL_ERROR); } @@ -2548,9 +2548,9 @@ public class Http2StreamTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -2600,7 +2600,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); _decodedHeaders.Clear(); _hpackDecoder.Decode(trailersFrame.PayloadSequence, endHeaders: true, handler: this); @@ -2614,9 +2614,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -2652,7 +2652,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); _decodedHeaders.Clear(); _hpackDecoder.Decode(trailersFrame.PayloadSequence, endHeaders: true, handler: this); @@ -2666,9 +2666,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(context => { @@ -2690,7 +2690,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("500", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("500", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -2699,9 +2699,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -2728,7 +2728,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -3125,9 +3125,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -3149,7 +3149,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -3160,9 +3160,9 @@ public class Http2StreamTests : Http2TestBase var writeStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -3198,7 +3198,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -3206,9 +3206,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(httpContext => { @@ -3242,7 +3242,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.True(_helloWorldBytes.AsSpan().SequenceEqual(dataFrame.PayloadSequence.ToArray())); } @@ -3252,9 +3252,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3288,7 +3288,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.True(_helloWorldBytes.AsSpan().SequenceEqual(dataFrame.PayloadSequence.ToArray())); } @@ -3298,9 +3298,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3341,7 +3341,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal(Encoding.ASCII.GetBytes(new string('a', 4102)), dataFrame.PayloadSequence.ToArray()); } @@ -3350,9 +3350,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3394,7 +3394,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal(Encoding.ASCII.GetBytes(new string('a', 4102)), dataFrame.PayloadSequence.ToArray()); } @@ -3403,9 +3403,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3440,7 +3440,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.True(_helloWorldBytes.AsSpan().SequenceEqual(dataFrame.PayloadSequence.ToArray())); } @@ -3449,9 +3449,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3490,7 +3490,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.True(_helloWorldBytes.AsSpan().SequenceEqual(dataFrame.PayloadSequence.ToArray())); } @@ -3499,9 +3499,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3535,7 +3535,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.True(_helloWorldBytes.AsSpan().SequenceEqual(dataFrame.PayloadSequence.ToArray())); } @@ -3544,9 +3544,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3578,7 +3578,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -3586,9 +3586,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3616,7 +3616,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -3626,9 +3626,9 @@ public class Http2StreamTests : Http2TestBase var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3661,9 +3661,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3703,9 +3703,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3759,7 +3759,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -3767,9 +3767,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3809,7 +3809,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("12", _decodedHeaders[HeaderNames.ContentLength]); } @@ -3818,9 +3818,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(httpContext => { @@ -3855,7 +3855,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("12", _decodedHeaders[HeaderNames.ContentLength]); } @@ -3864,9 +3864,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3895,7 +3895,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("12", _decodedHeaders[HeaderNames.ContentLength]); } @@ -3904,9 +3904,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -3959,7 +3959,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("54", _decodedHeaders[HeaderNames.ContentLength]); } @@ -3968,9 +3968,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -3991,7 +3991,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } [Fact] @@ -4000,9 +4000,9 @@ public class Http2StreamTests : Http2TestBase InvalidOperationException writeEx = null; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4024,7 +4024,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.NotNull(writeEx); } @@ -4034,9 +4034,9 @@ public class Http2StreamTests : Http2TestBase var expectedException = new Exception(); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4057,7 +4057,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("500", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("500", _decodedHeaders[InternalHeaderNames.Status]); Assert.Contains(TestSink.Writes, w => w.EventId.Id == 13 && w.LogLevel == LogLevel.Error && w.Exception is ConnectionAbortedException && w.Exception.InnerException == expectedException); @@ -4071,9 +4071,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4112,7 +4112,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders["content-length"]); } @@ -4124,9 +4124,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4172,7 +4172,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders["content-length"]); _decodedHeaders.Clear(); @@ -4190,9 +4190,9 @@ public class Http2StreamTests : Http2TestBase var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4233,7 +4233,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("500", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("500", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -4245,9 +4245,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4298,7 +4298,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); } @@ -4311,9 +4311,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4355,7 +4355,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); } @@ -4367,9 +4367,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4422,7 +4422,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); } @@ -4433,9 +4433,9 @@ public class Http2StreamTests : Http2TestBase var tcs = new TaskCompletionSource(); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4467,7 +4467,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders[HeaderNames.ContentLength]); await tcs.Task.DefaultTimeout(); @@ -4481,9 +4481,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4540,7 +4540,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); @@ -4560,9 +4560,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4614,7 +4614,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); @@ -4634,9 +4634,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4690,7 +4690,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("25", _decodedHeaders[HeaderNames.ContentLength]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); @@ -4704,9 +4704,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => @@ -4761,7 +4761,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("25", _decodedHeaders[HeaderNames.ContentLength]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); @@ -4775,9 +4775,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4835,7 +4835,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); @@ -4855,9 +4855,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -4919,7 +4919,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); @@ -4939,9 +4939,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -5001,7 +5001,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); @@ -5021,9 +5021,9 @@ public class Http2StreamTests : Http2TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async context => { @@ -5088,7 +5088,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("Hello World", Encoding.UTF8.GetString(bodyFrame.Payload.Span)); @@ -5135,7 +5135,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders["content-length"]); } @@ -5208,7 +5208,7 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.True(_helloWorldBytes.AsSpan().SequenceEqual(dataFrame1.PayloadSequence.ToArray())); @@ -5223,9 +5223,9 @@ public class Http2StreamTests : Http2TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(async httpContext => { @@ -5260,6 +5260,6 @@ public class Http2StreamTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs index 1c140149af..9f794bccac 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs @@ -36,10 +36,10 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, protected static readonly IEnumerable<KeyValuePair<string, string>> _browserRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("user-agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0"), new KeyValuePair<string, string>("accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"), new KeyValuePair<string, string>("accept-language", "en-US,en;q=0.5"), @@ -49,18 +49,18 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, protected static readonly IEnumerable<KeyValuePair<string, string>> _postRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; protected static readonly IEnumerable<KeyValuePair<string, string>> _expectContinueRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "127.0.0.1"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "127.0.0.1"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.Expect, "100-continue"), }; @@ -72,10 +72,10 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, protected static readonly IEnumerable<KeyValuePair<string, string>> _oneContinuationRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("a", _4kHeaderValue), new KeyValuePair<string, string>("b", _4kHeaderValue), new KeyValuePair<string, string>("c", _4kHeaderValue), @@ -84,10 +84,10 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, protected static readonly IEnumerable<KeyValuePair<string, string>> _twoContinuationsRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("a", _4kHeaderValue), new KeyValuePair<string, string>("b", _4kHeaderValue), new KeyValuePair<string, string>("c", _4kHeaderValue), @@ -99,10 +99,10 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, protected static IEnumerable<KeyValuePair<string, string>> ReadRateRequestHeaders(int expectedBytes) => new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/" + expectedBytes), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/" + expectedBytes), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; protected static readonly byte[] _helloBytes = Encoding.ASCII.GetBytes("hello"); @@ -343,7 +343,7 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, _echoMethodNoBody = context => { Assert.False(context.Request.CanHaveBody()); - Assert.False(context.Request.Headers.ContainsKey(PseudoHeaderNames.Method)); + Assert.False(context.Request.Headers.ContainsKey(InternalHeaderNames.Method)); context.Response.Headers["Method"] = context.Request.Method; return Task.CompletedTask; @@ -351,7 +351,7 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, _echoHost = context => { - Assert.False(context.Request.Headers.ContainsKey(PseudoHeaderNames.Authority)); + Assert.False(context.Request.Headers.ContainsKey(InternalHeaderNames.Authority)); context.Response.Headers.Host = context.Request.Headers.Host; return Task.CompletedTask; @@ -359,7 +359,7 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, _echoPath = context => { - Assert.False(context.Request.Headers.ContainsKey(PseudoHeaderNames.Path)); + Assert.False(context.Request.Headers.ContainsKey(InternalHeaderNames.Path)); context.Response.Headers["path"] = context.Request.Path.ToString(); context.Response.Headers["rawtarget"] = context.Features.Get<IHttpRequestFeature>().RawTarget; @@ -1294,20 +1294,20 @@ public class Http2TestBase : TestApplicationErrorLoggerLoggedTest, IDisposable, { foreach (var header in expectedHeaders) { - if (header.Key == PseudoHeaderNames.Method) + if (header.Key == InternalHeaderNames.Method) { Assert.Equal(header.Value, _receivedRequestFields.Method); } - else if (header.Key == PseudoHeaderNames.Authority) + else if (header.Key == InternalHeaderNames.Authority) { Assert.True(_receivedHeaders.TryGetValue(HeaderNames.Host, out var host), header.Key); Assert.Equal(header.Value, host); } - else if (header.Key == PseudoHeaderNames.Scheme) + else if (header.Key == InternalHeaderNames.Scheme) { Assert.Equal(header.Value, _receivedRequestFields.Scheme); } - else if (header.Key == PseudoHeaderNames.Path) + else if (header.Key == InternalHeaderNames.Path) { Assert.Equal(header.Value, _receivedRequestFields.RawTarget); } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs index 1e275339dd..fcdb46d9c8 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs @@ -246,9 +246,9 @@ public class Http2TimeoutTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; await InitializeConnectionAsync(_appAbort); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2WebSocketTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2WebSocketTests.cs index e89febf0cc..b285e0d362 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2WebSocketTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2WebSocketTests.cs @@ -55,11 +55,11 @@ public class Http2WebSocketTests : Http2TestBase // origin = http://www.example.com var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "websocket"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/chat"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "server.example.com"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "websocket"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/chat"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "server.example.com"), new KeyValuePair<string, string>(HeaderNames.WebSocketSubProtocols, "chat, superchat"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketExtensions, "permessage-deflate"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketVersion, "13"), @@ -79,7 +79,7 @@ public class Http2WebSocketTests : Http2TestBase Assert.Equal(3, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", _decodedHeaders["content-length"]); } @@ -120,11 +120,11 @@ public class Http2WebSocketTests : Http2TestBase // origin = http://www.example.com var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "websocket"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/chat"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "server.example.com"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "websocket"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/chat"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "server.example.com"), new KeyValuePair<string, string>(HeaderNames.WebSocketSubProtocols, "chat, superchat"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketExtensions, "permessage-deflate"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketVersion, "13"), @@ -142,7 +142,7 @@ public class Http2WebSocketTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); var dataFrame = await ExpectAsync(Http2FrameType.DATA, withLength: 1, @@ -199,11 +199,11 @@ public class Http2WebSocketTests : Http2TestBase // origin = http://www.example.com var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "websocket"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/chat"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "server.example.com"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "websocket"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/chat"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "server.example.com"), new KeyValuePair<string, string>(HeaderNames.WebSocketSubProtocols, "chat, superchat"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketExtensions, "permessage-deflate"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketVersion, "13"), @@ -221,7 +221,7 @@ public class Http2WebSocketTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); var dataFrame = await ExpectAsync(Http2FrameType.DATA, withLength: 1, @@ -256,7 +256,7 @@ public class Http2WebSocketTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); dataFrame = await ExpectAsync(Http2FrameType.DATA, withLength: 1, @@ -282,8 +282,8 @@ public class Http2WebSocketTests : Http2TestBase // :path and :scheme are required with :protocol, :authority is optional var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "WebSocket"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "WebSocket"), new KeyValuePair<string, string>(headerName, value) }; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); @@ -300,11 +300,11 @@ public class Http2WebSocketTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "example.com"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "WebSocket") + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "example.com"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "WebSocket") }; await SendHeadersAsync(1, Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM, headers); @@ -331,11 +331,11 @@ public class Http2WebSocketTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "websocket"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/chat"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "server.example.com"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "websocket"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/chat"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "server.example.com"), new KeyValuePair<string, string>(HeaderNames.WebSocketSubProtocols, "chat, superchat"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketExtensions, "permessage-deflate"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketVersion, "13"), @@ -359,7 +359,7 @@ public class Http2WebSocketTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); var dataFrame = await ExpectAsync(Http2FrameType.DATA, withLength: 1, @@ -400,11 +400,11 @@ public class Http2WebSocketTests : Http2TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "websocket"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/chat"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "server.example.com"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "websocket"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/chat"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "server.example.com"), new KeyValuePair<string, string>(HeaderNames.WebSocketSubProtocols, "chat, superchat"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketExtensions, "permessage-deflate"), new KeyValuePair<string, string>(HeaderNames.SecWebSocketVersion, "13"), @@ -423,7 +423,7 @@ public class Http2WebSocketTests : Http2TestBase Assert.Equal(2, _decodedHeaders.Count); Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", _decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", _decodedHeaders[InternalHeaderNames.Status]); var dataFrame = await ExpectAsync(Http2FrameType.DATA, withLength: 1, diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs index 47deea2516..39f924cce4 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs @@ -28,10 +28,10 @@ public class Http3ConnectionTests : Http3TestBase { private static readonly KeyValuePair<string, string>[] Headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; [Fact] @@ -56,10 +56,10 @@ public class Http3ConnectionTests : Http3TestBase var requestStream = await Http3Api.CreateRequestStream(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }); await requestStream.SendDataAsync(Encoding.ASCII.GetBytes("Hello world"), endStream: true); @@ -94,10 +94,10 @@ public class Http3ConnectionTests : Http3TestBase var requestStream = await Http3Api.CreateRequestStream(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "127.0.0.1"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "127.0.0.1"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.Expect, "100-continue"), }); @@ -109,7 +109,7 @@ public class Http3ConnectionTests : Http3TestBase await requestStream.SendDataAsync(Encoding.ASCII.GetBytes("Hello world"), endStream: false); var headers = await requestStream.ExpectHeadersAsync(); - Assert.Equal("200", headers[PseudoHeaderNames.Status]); + Assert.Equal("200", headers[InternalHeaderNames.Status]); var responseData = await requestStream.ExpectDataAsync(); Assert.Equal("Hello world", Encoding.ASCII.GetString(responseData.ToArray())); @@ -128,9 +128,9 @@ public class Http3ConnectionTests : Http3TestBase { var requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.Cookie, "a=0"), new KeyValuePair<string, string>(HeaderNames.Cookie, "b=1"), new KeyValuePair<string, string>(HeaderNames.Cookie, "c=2"), @@ -354,10 +354,10 @@ public class Http3ConnectionTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; await Http3Api.InitializeConnectionAsync(_echoApplication); @@ -373,10 +373,10 @@ public class Http3ConnectionTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentType, "application/json"), }; @@ -411,20 +411,20 @@ public class Http3ConnectionTests : Http3TestBase KeyValuePair<string, string>[] requestHeaders1 = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentType, "application/json") }; // Note: No content-type KeyValuePair<string, string>[] requestHeaders2 = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80") + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80") }; await Http3Api.InitializeConnectionAsync(_echoApplication); @@ -455,10 +455,10 @@ public class Http3ConnectionTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; await Http3Api.InitializeConnectionAsync(_echoApplication); @@ -489,10 +489,10 @@ public class Http3ConnectionTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestDelegate = sendData ? _echoApplication : _noopApplication; @@ -512,10 +512,10 @@ public class Http3ConnectionTests : Http3TestBase { var requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentType, "application/json") }; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3StreamTests.cs index 3d61bbbcc8..b06894fc47 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3StreamTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3StreamTests.cs @@ -29,17 +29,17 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_echoApplication, headers); await requestStream.SendDataAsync(Encoding.ASCII.GetBytes("Hello world"), endStream: true); var responseHeaders = await requestStream.ExpectHeadersAsync(); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); var responseData = await requestStream.ExpectDataAsync(); Assert.Equal("Hello world", Encoding.ASCII.GetString(responseData.ToArray())); @@ -50,10 +50,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(context => @@ -63,7 +63,7 @@ public class Http3StreamTests : Http3TestBase }, headers, endStream: true); var responseHeaders = await requestStream.ExpectHeadersAsync(); - Assert.Equal("401", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("401", responseHeaders[InternalHeaderNames.Status]); await requestStream.ExpectReceiveEndOfStream(); } @@ -73,10 +73,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, ""), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, ""), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_echoApplication, headers); @@ -91,10 +91,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Hello,World"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Hello,World"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_echoApplication, headers); @@ -109,10 +109,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_echoMethod, headers, endStream: true); @@ -121,7 +121,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(4, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("Custom", responseHeaders["Method"]); Assert.Equal("0", responseHeaders["content-length"]); } @@ -131,10 +131,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("test", new string('a', 20000)) }; @@ -150,7 +150,7 @@ public class Http3StreamTests : Http3TestBase public async Task ConnectMethod_Accepted() { // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT") }; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT") }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_echoMethod, headers, endStream: true); @@ -158,7 +158,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(4, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("CONNECT", responseHeaders["Method"]); Assert.Equal("0", responseHeaders["content-length"]); } @@ -166,9 +166,9 @@ public class Http3StreamTests : Http3TestBase [Fact] public async Task OptionsStar_LeftOutOfPath() { - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "OPTIONS"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "*")}; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "OPTIONS"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "*")}; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_echoPath, headers, endStream: true); @@ -176,7 +176,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(5, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("", responseHeaders["path"]); Assert.Equal("*", responseHeaders["rawtarget"]); Assert.Equal("0", responseHeaders["content-length"]); @@ -185,9 +185,9 @@ public class Http3StreamTests : Http3TestBase [Fact] public async Task OptionsSlash_Accepted() { - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "OPTIONS"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/")}; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "OPTIONS"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/")}; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_echoPath, headers, endStream: true); @@ -195,7 +195,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(5, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("/", responseHeaders["path"]); Assert.Equal("/", responseHeaders["rawtarget"]); Assert.Equal("0", responseHeaders["content-length"]); @@ -205,9 +205,9 @@ public class Http3StreamTests : Http3TestBase public async Task PathAndQuery_Separated() { // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/a/path?a&que%35ry")}; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/a/path?a&que%35ry")}; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(context => { @@ -221,7 +221,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(6, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("/a/path", responseHeaders["path"]); Assert.Equal("?a&que%35ry", responseHeaders["query"]); Assert.Equal("/a/path?a&que%35ry", responseHeaders["rawtarget"]); @@ -240,9 +240,9 @@ public class Http3StreamTests : Http3TestBase public async Task Path_DecodedAndNormalized(string input, string expected) { // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, input)}; + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, input)}; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(context => { @@ -255,7 +255,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders["content-length"]); } @@ -265,7 +265,7 @@ public class Http3StreamTests : Http3TestBase public async Task ConnectMethod_WithSchemeOrPath_Reset(string headerName, string value) { // :path and :scheme are not allowed, :authority is optional - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), new KeyValuePair<string, string>(headerName, value) }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_noopApplication, headers, endStream: true); @@ -281,9 +281,9 @@ public class Http3StreamTests : Http3TestBase [InlineData("ftp")] public async Task SchemeMismatch_Reset(string scheme) { - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, scheme) }; // Not the expected "http" + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, scheme) }; // Not the expected "http" var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_noopApplication, headers, endStream: true); @@ -300,9 +300,9 @@ public class Http3StreamTests : Http3TestBase { _serviceContext.ServerOptions.AllowAlternateSchemes = true; - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, scheme) }; // Not the expected "http" + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, scheme) }; // Not the expected "http" var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(context => { @@ -314,7 +314,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders["content-length"]); } @@ -325,9 +325,9 @@ public class Http3StreamTests : Http3TestBase { _serviceContext.ServerOptions.AllowAlternateSchemes = true; - var headers = new[] { new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, scheme) }; // Not the expected "http" + var headers = new[] { new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, scheme) }; // Not the expected "http" var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_noopApplication, headers, endStream: true); @@ -342,9 +342,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_noopApplication, headers, endStream: true); @@ -353,7 +353,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders["content-length"]); } @@ -362,10 +362,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, ""), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, ""), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_noopApplication, headers, endStream: true); @@ -373,7 +373,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders["content-length"]); } @@ -382,9 +382,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("Host", "abc"), }; @@ -394,7 +394,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(4, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders[HeaderNames.ContentLength]); Assert.Equal("abc", responseHeaders[HeaderNames.Host]); } @@ -404,10 +404,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, ""), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, ""), new KeyValuePair<string, string>("Host", "abc"), }; @@ -417,7 +417,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(4, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders[HeaderNames.ContentLength]); Assert.Equal("abc", responseHeaders[HeaderNames.Host]); } @@ -427,10 +427,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "def"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "def"), new KeyValuePair<string, string>("Host", "abc"), }; @@ -440,7 +440,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(4, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders[HeaderNames.ContentLength]); Assert.Equal("def", responseHeaders[HeaderNames.Host]); } @@ -450,10 +450,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "def"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "def"), new KeyValuePair<string, string>("Host", "a=bc"), }; @@ -463,7 +463,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(4, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders[HeaderNames.ContentLength]); Assert.Equal("def", responseHeaders[HeaderNames.Host]); } @@ -473,10 +473,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "local=host:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "local=host:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_noopApplication, headers, endStream: true); @@ -492,10 +492,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "d=ef"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "d=ef"), new KeyValuePair<string, string>("Host", "abc"), }; @@ -512,9 +512,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("Host", "host1"), new KeyValuePair<string, string>("Host", "host2"), }; @@ -535,10 +535,10 @@ public class Http3StreamTests : Http3TestBase // https://github.com/aspnet/KestrelHttpServer/issues/2872 var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET" + new string('a', 1024 * 3)), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/Hello/How/Are/You/" + new string('a', 1024 * 3)), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost" + new string('a', 1024 * 3) + ":80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET" + new string('a', 1024 * 3)), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/Hello/How/Are/You/" + new string('a', 1024 * 3)), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost" + new string('a', 1024 * 3) + ":80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_noopApplication, headers, endStream: true); @@ -553,9 +553,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; @@ -573,7 +573,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders[HeaderNames.ContentLength]); } @@ -582,9 +582,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; @@ -609,7 +609,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders[HeaderNames.ContentLength]); } @@ -618,9 +618,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -644,7 +644,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("0", responseHeaders[HeaderNames.ContentLength]); } @@ -653,10 +653,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -686,9 +686,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; @@ -716,9 +716,9 @@ public class Http3StreamTests : Http3TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var data = new byte[] { 1, 2, 3, 4, 5, 6 }; @@ -757,10 +757,10 @@ public class Http3StreamTests : Http3TestBase var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); KeyValuePair<string, string>[] requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentType, "application/json") }; @@ -791,10 +791,10 @@ public class Http3StreamTests : Http3TestBase { KeyValuePair<string, string>[] requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/hello"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/hello"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>(HeaderNames.ContentType, "application/json") }; @@ -825,10 +825,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(context => @@ -855,10 +855,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -878,7 +878,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(2, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); } [Fact] @@ -886,10 +886,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; _serviceContext.ServerOptions.ResponseHeaderEncodingSelector = _ => Encoding.UTF8; @@ -912,7 +912,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(4, responseHeaders.Count); Assert.Contains("date", responseHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); Assert.Equal("Custom ä½ å¥½ Type", responseHeaders[HeaderNames.ContentType]); Assert.Equal("Custom ä½ å¥½ Value", responseHeaders["CustomName"]); } @@ -922,10 +922,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var encoding = Encoding.GetEncoding(Encoding.Latin1.CodePage, EncoderFallback.ExceptionFallback, @@ -949,10 +949,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -981,10 +981,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(context => @@ -1007,10 +1007,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -1035,10 +1035,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; _serviceContext.ServerOptions.ResponseHeaderEncodingSelector = _ => Encoding.UTF8; @@ -1073,10 +1073,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var encoding = Encoding.GetEncoding(Encoding.Latin1.CodePage, EncoderFallback.ExceptionFallback, @@ -1104,10 +1104,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(context => @@ -1133,9 +1133,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -1166,7 +1166,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", decodedHeaders["content-length"]); await requestStream.ExpectReceiveEndOfStream(); @@ -1180,9 +1180,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1218,7 +1218,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", decodedHeaders["content-length"]); Assert.Single(decodedTrailers); @@ -1232,9 +1232,9 @@ public class Http3StreamTests : Http3TestBase var appTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1268,7 +1268,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("500", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("500", decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", decodedHeaders[HeaderNames.ContentLength]); } @@ -1280,9 +1280,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1313,7 +1313,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(2, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); @@ -1333,9 +1333,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1365,7 +1365,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", decodedHeaders[HeaderNames.ContentLength]); clientTcs.SetResult(); @@ -1382,9 +1382,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1417,7 +1417,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(2, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); Assert.Equal("Hello World", Encoding.UTF8.GetString(data.Span)); @@ -1434,9 +1434,9 @@ public class Http3StreamTests : Http3TestBase var tcs = new TaskCompletionSource(); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1459,7 +1459,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", decodedHeaders["content-length"]); await tcs.Task.DefaultTimeout(); @@ -1475,9 +1475,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1513,7 +1513,7 @@ public class Http3StreamTests : Http3TestBase var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(2, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); Assert.Equal("Hello World", Encoding.UTF8.GetString(data.Span)); @@ -1535,9 +1535,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1568,7 +1568,7 @@ public class Http3StreamTests : Http3TestBase var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(2, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); Assert.Equal("Hello World", Encoding.UTF8.GetString(data.Span)); @@ -1590,9 +1590,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1625,7 +1625,7 @@ public class Http3StreamTests : Http3TestBase var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(3, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("25", decodedHeaders[HeaderNames.ContentLength]); var data = await requestStream.ExpectDataAsync(); @@ -1647,9 +1647,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -1683,7 +1683,7 @@ public class Http3StreamTests : Http3TestBase var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(3, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); Assert.Equal("25", decodedHeaders[HeaderNames.ContentLength]); var data = await requestStream.ExpectDataAsync(); @@ -1705,9 +1705,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1742,7 +1742,7 @@ public class Http3StreamTests : Http3TestBase var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(2, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); Assert.Equal("Hello World", Encoding.UTF8.GetString(data.Span)); @@ -1764,9 +1764,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1806,7 +1806,7 @@ public class Http3StreamTests : Http3TestBase var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(2, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); Assert.Equal("Hello World", Encoding.UTF8.GetString(data.Span)); @@ -1828,9 +1828,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1867,7 +1867,7 @@ public class Http3StreamTests : Http3TestBase var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(2, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); Assert.Equal("Hello World", Encoding.UTF8.GetString(data.Span)); @@ -1891,9 +1891,9 @@ public class Http3StreamTests : Http3TestBase var clientTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -1935,7 +1935,7 @@ public class Http3StreamTests : Http3TestBase var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(2, decodedHeaders.Count); Assert.Contains("date", decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); Assert.Equal("Hello World", Encoding.UTF8.GetString(data.Span)); @@ -1976,9 +1976,9 @@ public class Http3StreamTests : Http3TestBase var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var trailers = new[] { @@ -2005,9 +2005,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var trailers = new[] { @@ -2042,9 +2042,9 @@ public class Http3StreamTests : Http3TestBase var syncPoint = new SyncPoint(); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var trailers = new[] { @@ -2115,9 +2115,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_echoApplication, headers); @@ -2149,9 +2149,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(":unknown", "0"), }; @@ -2163,10 +2163,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Status, "200"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Status, "200"), }; return HEADERS_Received_InvalidHeaderFields_StreamError(headers, expectedErrorMessage: CoreStrings.HttpErrorResponsePseudoHeaderField); @@ -2179,10 +2179,10 @@ public class Http3StreamTests : Http3TestBase var data = new TheoryData<IEnumerable<KeyValuePair<string, string>>>(); var requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "127.0.0.1"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "127.0.0.1"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; foreach (var headerField in requestHeaders) @@ -2200,7 +2200,7 @@ public class Http3StreamTests : Http3TestBase get { var data = new TheoryData<IEnumerable<KeyValuePair<string, string>>>(); - var methodHeader = new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"); + var methodHeader = new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"); var headers = new[] { methodHeader }; data.Add(headers); @@ -2215,10 +2215,10 @@ public class Http3StreamTests : Http3TestBase var data = new TheoryData<IEnumerable<KeyValuePair<string, string>>>(); var requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "127.0.0.1"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "127.0.0.1"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("content-length", "0") }; @@ -2239,9 +2239,9 @@ public class Http3StreamTests : Http3TestBase var data = new TheoryData<IEnumerable<KeyValuePair<string, string>>>(); var requestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; foreach (var headerField in requestHeaders) @@ -2305,9 +2305,9 @@ public class Http3StreamTests : Http3TestBase // > 32kb var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("a", _4kHeaderValue), new KeyValuePair<string, string>("b", _4kHeaderValue), new KeyValuePair<string, string>("c", _4kHeaderValue), @@ -2328,9 +2328,9 @@ public class Http3StreamTests : Http3TestBase var headers = new List<KeyValuePair<string, string>>(); headers.AddRange(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }); for (var i = 0; i < 100; i++) { @@ -2345,9 +2345,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("Custom", "val\0ue"), }; @@ -2359,9 +2359,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("connection", "keep-alive") }; @@ -2373,9 +2373,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("te", "trailers, deflate") }; @@ -2387,9 +2387,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>("te", "trailers") }; @@ -2406,9 +2406,9 @@ public class Http3StreamTests : Http3TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 15; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -2427,7 +2427,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, receivedHeaders.Count); Assert.Contains("date", receivedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", receivedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", receivedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", receivedHeaders[HeaderNames.ContentLength]); } @@ -2440,9 +2440,9 @@ public class Http3StreamTests : Http3TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 10; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), new KeyValuePair<string, string>(HeaderNames.ContentLength, "12"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => @@ -2468,7 +2468,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, receivedHeaders.Count); Assert.Contains("date", receivedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("413", receivedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("413", receivedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", receivedHeaders[HeaderNames.ContentLength]); Assert.NotNull(exception); @@ -2480,9 +2480,9 @@ public class Http3StreamTests : Http3TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 15; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -2500,7 +2500,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, receivedHeaders.Count); Assert.Contains("date", receivedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", receivedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", receivedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", receivedHeaders[HeaderNames.ContentLength]); } @@ -2513,9 +2513,9 @@ public class Http3StreamTests : Http3TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 10; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { @@ -2540,7 +2540,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, receivedHeaders.Count); Assert.Contains("date", receivedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("413", receivedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("413", receivedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", receivedHeaders[HeaderNames.ContentLength]); Assert.NotNull(exception); @@ -2557,9 +2557,9 @@ public class Http3StreamTests : Http3TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 20; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; if (includeContentLength) { @@ -2595,7 +2595,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, receivedHeaders.Count); Assert.Contains("date", receivedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("413", receivedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("413", receivedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", receivedHeaders[HeaderNames.ContentLength]); Assert.NotNull(exception); @@ -2609,9 +2609,9 @@ public class Http3StreamTests : Http3TestBase _serviceContext.ServerOptions.Limits.MaxRequestBodySize = 10; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; if (includeContentLength) { @@ -2639,7 +2639,7 @@ public class Http3StreamTests : Http3TestBase Assert.Equal(3, receivedHeaders.Count); Assert.Contains("date", receivedHeaders.Keys, StringComparer.OrdinalIgnoreCase); - Assert.Equal("200", receivedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", receivedHeaders[InternalHeaderNames.Status]); Assert.Equal("0", receivedHeaders[HeaderNames.ContentLength]); } @@ -2648,9 +2648,9 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, new string('A', 8192 / 2)), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/" + new string('A', 8192 / 2)), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http") + new KeyValuePair<string, string>(InternalHeaderNames.Method, new string('A', 8192 / 2)), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/" + new string('A', 8192 / 2)), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http") }; return HEADERS_Received_InvalidHeaderFields_StreamError(headers, CoreStrings.BadRequest_RequestLineTooLong, Http3ErrorCode.RequestRejected); @@ -2680,10 +2680,10 @@ public class Http3StreamTests : Http3TestBase // Connection is still alive and available for requests var requestStream = await Http3Api.CreateRequestStream(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }, endStream: true).DefaultTimeout(); await requestStream.ExpectHeadersAsync().DefaultTimeout(); @@ -2712,10 +2712,10 @@ public class Http3StreamTests : Http3TestBase var requestStream = await Http3Api.CreateRequestStream(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }, endStream: true).DefaultTimeout(); await requestStream.WaitForStreamErrorAsync( @@ -2753,9 +2753,9 @@ public class Http3StreamTests : Http3TestBase } }, new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }); var sourceData = new byte[1024]; @@ -2767,7 +2767,7 @@ public class Http3StreamTests : Http3TestBase await requestStream.SendDataAsync(sourceData); var decodedHeaders = await requestStream.ExpectHeadersAsync(); Assert.Equal(2, decodedHeaders.Count); - Assert.Equal("200", decodedHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", decodedHeaders[InternalHeaderNames.Status]); var data = await requestStream.ExpectDataAsync(); @@ -2789,10 +2789,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var headerText = string.Create(6 * 1024, new object(), (chars, state) => @@ -2814,7 +2814,7 @@ public class Http3StreamTests : Http3TestBase }, headers); var responseHeaders = await requestStream.ExpectHeadersAsync(); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); for (var i = 0; i < 10; i++) { @@ -2829,10 +2829,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var headerText = string.Create(6 * 1024, new object(), (chars, state) => @@ -2854,7 +2854,7 @@ public class Http3StreamTests : Http3TestBase }, headers); var responseHeaders = await requestStream.ExpectHeadersAsync(); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); var responseTrailers = await requestStream.ExpectHeadersAsync(); for (var i = 0; i < 10; i++) @@ -2870,10 +2870,10 @@ public class Http3StreamTests : Http3TestBase { var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(c => @@ -2882,7 +2882,7 @@ public class Http3StreamTests : Http3TestBase }, headers); var responseHeaders = await requestStream.ExpectHeadersAsync(expectEnd: true); - Assert.Equal("200", responseHeaders[PseudoHeaderNames.Status]); + Assert.Equal("200", responseHeaders[InternalHeaderNames.Status]); } [Theory] @@ -2894,9 +2894,9 @@ public class Http3StreamTests : Http3TestBase var tcs = new TaskCompletionSource(); var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(async context => { diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs index ecb52ca4b5..6d0bee2302 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs @@ -57,10 +57,10 @@ public abstract class Http3TestBase : TestApplicationErrorLoggerLoggedTest, IDis protected static readonly IEnumerable<KeyValuePair<string, string>> _browserRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("user-agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0"), new KeyValuePair<string, string>("accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"), new KeyValuePair<string, string>("accept-language", "en-US,en;q=0.5"), @@ -70,10 +70,10 @@ public abstract class Http3TestBase : TestApplicationErrorLoggerLoggedTest, IDis protected static IEnumerable<KeyValuePair<string, string>> ReadRateRequestHeaders(int expectedBytes) => new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/" + expectedBytes), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/" + expectedBytes), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; public Http3TestBase() diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs index 4e94029c43..68d6b38be4 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs @@ -64,10 +64,10 @@ public class Http3TimeoutTests : Http3TestBase var limits = _serviceContext.ServerOptions.Limits; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; var requestStream = await Http3Api.InitializeConnectionAndStreamsAsync(_noopApplication, null).DefaultTimeout(); @@ -143,10 +143,10 @@ public class Http3TimeoutTests : Http3TestBase var limits = _serviceContext.ServerOptions.Limits; var headers = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "Custom"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "Custom"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; await Http3Api.InitializeConnectionAsync(_noopApplication).DefaultTimeout(); @@ -288,10 +288,10 @@ public class Http3TimeoutTests : Http3TestBase var requestStream = await Http3Api.CreateRequestStream(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }, null, true, new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously)); await requestStream.OnDisposingTask.DefaultTimeout(); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportHandshakeTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportHandshakeTests.cs index 5fd8ccc9b0..3020856705 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportHandshakeTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportHandshakeTests.cs @@ -65,18 +65,18 @@ public class WebTransportHandshakeTests : Http3TestBase var requestStream = await Http3Api.CreateRequestStream(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "webtransport"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "server.example.com"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "webtransport"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "server.example.com"), new KeyValuePair<string, string>(HeaderNames.Origin, "server.example.com"), new KeyValuePair<string, string>(WebTransportSession.CurrentSuppportedVersion, "1") }); var response2 = await requestStream.ExpectHeadersAsync(); - Assert.Equal((int)HttpStatusCode.OK, Convert.ToInt32(response2[PseudoHeaderNames.Status], null)); + Assert.Equal((int)HttpStatusCode.OK, Convert.ToInt32(response2[InternalHeaderNames.Status], null)); await requestStream.OnDisposedTask.DefaultTimeout(); Assert.True(await appCompletedTcs.Task); @@ -86,27 +86,27 @@ public class WebTransportHandshakeTests : Http3TestBase [InlineData( ((long)Http3ErrorCode.ProtocolError), nameof(CoreStrings.Http3MethodMustBeConnectWhenUsingProtocolPseudoHeader), - nameof(PseudoHeaderNames.Method), "GET", // incorrect method (verifies that webtransport doesn't break regular Http/3 get) - nameof(PseudoHeaderNames.Protocol), "webtransport", - nameof(PseudoHeaderNames.Scheme), "http", - nameof(PseudoHeaderNames.Path), "/", - nameof(PseudoHeaderNames.Authority), "server.example.com", + nameof(InternalHeaderNames.Method), "GET", // incorrect method (verifies that webtransport doesn't break regular Http/3 get) + nameof(InternalHeaderNames.Protocol), "webtransport", + nameof(InternalHeaderNames.Scheme), "http", + nameof(InternalHeaderNames.Path), "/", + nameof(InternalHeaderNames.Authority), "server.example.com", nameof(HeaderNames.Origin), "server.example.com")] [InlineData( ((long)Http3ErrorCode.ProtocolError), nameof(CoreStrings.Http3MissingAuthorityOrPathPseudoHeaders), - nameof(PseudoHeaderNames.Method), "CONNECT", - nameof(PseudoHeaderNames.Protocol), "webtransport", - nameof(PseudoHeaderNames.Scheme), "http", - nameof(PseudoHeaderNames.Authority), "server.example.com", + nameof(InternalHeaderNames.Method), "CONNECT", + nameof(InternalHeaderNames.Protocol), "webtransport", + nameof(InternalHeaderNames.Scheme), "http", + nameof(InternalHeaderNames.Authority), "server.example.com", nameof(HeaderNames.Origin), "server.example.com")] // no path [InlineData( ((long)Http3ErrorCode.ProtocolError), nameof(CoreStrings.Http3MissingAuthorityOrPathPseudoHeaders), - nameof(PseudoHeaderNames.Method), "CONNECT", - nameof(PseudoHeaderNames.Protocol), "webtransport", - nameof(PseudoHeaderNames.Scheme), "http", - nameof(PseudoHeaderNames.Path), "/", + nameof(InternalHeaderNames.Method), "CONNECT", + nameof(InternalHeaderNames.Protocol), "webtransport", + nameof(InternalHeaderNames.Scheme), "http", + nameof(InternalHeaderNames.Path), "/", nameof(HeaderNames.Origin), "server.example.com")] // no authority public async Task WebTransportHandshake_IncorrectHeadersRejects(long error, string targetErrorMessage, params string[] headers) { @@ -154,11 +154,11 @@ public class WebTransportHandshakeTests : Http3TestBase { return coreStringName switch { - nameof(PseudoHeaderNames.Method) => PseudoHeaderNames.Method, - nameof(PseudoHeaderNames.Protocol) => PseudoHeaderNames.Protocol, - nameof(PseudoHeaderNames.Scheme) => PseudoHeaderNames.Scheme, - nameof(PseudoHeaderNames.Path) => PseudoHeaderNames.Path, - nameof(PseudoHeaderNames.Authority) => PseudoHeaderNames.Authority, + nameof(InternalHeaderNames.Method) => InternalHeaderNames.Method, + nameof(InternalHeaderNames.Protocol) => InternalHeaderNames.Protocol, + nameof(InternalHeaderNames.Scheme) => InternalHeaderNames.Scheme, + nameof(InternalHeaderNames.Path) => InternalHeaderNames.Path, + nameof(InternalHeaderNames.Authority) => InternalHeaderNames.Authority, nameof(HeaderNames.Origin) => HeaderNames.Origin, _ => throw new Exception("Header name not mapped yet") }; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportTestUtilities.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportTestUtilities.cs index 3250336428..2196d8b836 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportTestUtilities.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/WebTransport/WebTransportTestUtilities.cs @@ -59,11 +59,11 @@ internal class WebTransportTestUtilities var requestStream = await inMemory.CreateRequestStream(new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "CONNECT"), - new KeyValuePair<string, string>(PseudoHeaderNames.Protocol, "webtransport"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "server.example.com"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "CONNECT"), + new KeyValuePair<string, string>(InternalHeaderNames.Protocol, "webtransport"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "server.example.com"), new KeyValuePair<string, string>(HeaderNames.Origin, "server.example.com"), new KeyValuePair<string, string>(WebTransportSession.CurrentSuppportedVersion, "1") }); diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs index 2b239c746b..7f21e77c23 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs @@ -751,6 +751,24 @@ public class Http3RequestTests : LoggedTest Assert.Equal(HttpVersion.Version30, response2.Version); Assert.True(request2Headers.ContainsKey("alt-used")); + // Delay to ensure the stream has enough time to return to pool + await Task.Delay(100); + + // Act 3 + var request3 = new HttpRequestMessage(HttpMethod.Get, $"https://127.0.0.1:{host.GetPort()}/"); + request3.Headers.Add("id", "3"); + request3.VersionPolicy = HttpVersionPolicy.RequestVersionOrHigher; + + var response3 = await client.SendAsync(request3, CancellationToken.None); + response3.EnsureSuccessStatusCode(); + var request3Headers = requestHeaders.Single(i => i["id"] == "3"); + + // Assert 3 + Assert.Equal(HttpVersion.Version30, response3.Version); + Assert.True(request3Headers.ContainsKey("alt-used")); + + Assert.Same((string)request2Headers["alt-used"], (string)request3Headers["alt-used"]); + await host.StopAsync(); } } diff --git a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj index 778551de71..207921c9a9 100644 --- a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj +++ b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj @@ -9,7 +9,7 @@ <ItemGroup> <Compile Include="$(KestrelSharedSourceRoot)KnownHeaders.cs" /> - <Compile Include="$(SharedSourceRoot)PseudoHeaderNames.cs" Link="Shared\PseudoHeaderNames.cs"/> + <Compile Include="$(SharedSourceRoot)InternalHeaderNames.cs" Link="Shared\InternalHeaderNames.cs"/> <Compile Include="$(SharedSourceRoot)runtime\Http2\Hpack\H2StaticTable.Http2.cs" Link="Shared\runtime\Http2\%(Filename)%(Extension)" /> <Compile Include="$(SharedSourceRoot)runtime\Http2\Hpack\H2StaticTable.cs" Link="Shared\runtime\Http2\%(Filename)%(Extension)" /> <Compile Include="$(SharedSourceRoot)runtime\Http2\Hpack\HeaderField.cs" Link="Shared\runtime\Http2\%(Filename)%(Extension)" /> diff --git a/src/Shared/Http2cat/Http2Utilities.cs b/src/Shared/Http2cat/Http2Utilities.cs index a69bd089a3..96066f0545 100644 --- a/src/Shared/Http2cat/Http2Utilities.cs +++ b/src/Shared/Http2cat/Http2Utilities.cs @@ -35,10 +35,10 @@ internal sealed class Http2Utilities : IHttpStreamHeadersHandler public static readonly IEnumerable<KeyValuePair<string, string>> BrowserRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "https"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:443"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "https"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:443"), new KeyValuePair<string, string>("user-agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0"), new KeyValuePair<string, string>("accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"), new KeyValuePair<string, string>("accept-language", "en-US,en;q=0.5"), @@ -48,10 +48,10 @@ internal sealed class Http2Utilities : IHttpStreamHeadersHandler public static readonly IEnumerable<KeyValuePair<string, string>> BrowserRequestHeadersHttp = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "http"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "http"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("user-agent", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0"), new KeyValuePair<string, string>("accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"), new KeyValuePair<string, string>("accept-language", "en-US,en;q=0.5"), @@ -61,18 +61,18 @@ internal sealed class Http2Utilities : IHttpStreamHeadersHandler public static readonly IEnumerable<KeyValuePair<string, string>> PostRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "https"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "https"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; public static readonly IEnumerable<KeyValuePair<string, string>> ExpectContinueRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "127.0.0.1"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "https"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "127.0.0.1"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "https"), new KeyValuePair<string, string>("expect", "100-continue"), }; @@ -84,10 +84,10 @@ internal sealed class Http2Utilities : IHttpStreamHeadersHandler public static readonly IEnumerable<KeyValuePair<string, string>> OneContinuationRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "https"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "https"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("a", FourKHeaderValue), new KeyValuePair<string, string>("b", FourKHeaderValue), new KeyValuePair<string, string>("c", FourKHeaderValue), @@ -96,10 +96,10 @@ internal sealed class Http2Utilities : IHttpStreamHeadersHandler public static readonly IEnumerable<KeyValuePair<string, string>> TwoContinuationsRequestHeaders = new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "GET"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/"), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "https"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "GET"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/"), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "https"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), new KeyValuePair<string, string>("a", FourKHeaderValue), new KeyValuePair<string, string>("b", FourKHeaderValue), new KeyValuePair<string, string>("c", FourKHeaderValue), @@ -111,10 +111,10 @@ internal sealed class Http2Utilities : IHttpStreamHeadersHandler public static IEnumerable<KeyValuePair<string, string>> ReadRateRequestHeaders(int expectedBytes) => new[] { - new KeyValuePair<string, string>(PseudoHeaderNames.Method, "POST"), - new KeyValuePair<string, string>(PseudoHeaderNames.Path, "/" + expectedBytes), - new KeyValuePair<string, string>(PseudoHeaderNames.Scheme, "https"), - new KeyValuePair<string, string>(PseudoHeaderNames.Authority, "localhost:80"), + new KeyValuePair<string, string>(InternalHeaderNames.Method, "POST"), + new KeyValuePair<string, string>(InternalHeaderNames.Path, "/" + expectedBytes), + new KeyValuePair<string, string>(InternalHeaderNames.Scheme, "https"), + new KeyValuePair<string, string>(InternalHeaderNames.Authority, "localhost:80"), }; public static readonly byte[] _helloBytes = Encoding.ASCII.GetBytes("hello"); diff --git a/src/Shared/PseudoHeaderNames.cs b/src/Shared/InternalHeaderNames.cs index dcdde09a13..7515c26cb0 100644 --- a/src/Shared/PseudoHeaderNames.cs +++ b/src/Shared/InternalHeaderNames.cs @@ -4,7 +4,7 @@ namespace Microsoft.AspNetCore.Server; [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1802:Use literals where appropriate", Justification = "So referenceEquals works")] -internal static class PseudoHeaderNames +internal static class InternalHeaderNames { /// <summary>Gets the <c>:authority</c> HTTP header name.</summary> public static readonly string Authority = ":authority"; @@ -23,4 +23,7 @@ internal static class PseudoHeaderNames /// <summary>Gets the <c>:protocol</c> HTTP header name.</summary> public static readonly string Protocol = ":protocol"; + + /// <summary>Gets the <c>Alt-Used</c> HTTP header name.</summary> + public static readonly string AltUsed = "Alt-Used"; } |