Skip to content

Commit dfbae37

Browse files
github-actions[bot]JamesNK
github-actions[bot]
and
JamesNK
authored
Rename IHttpHeadersHandler to IHttpStreamHeadersHandler (#62750)
Co-authored-by: James Newton-King <james@newtonking.com>
1 parent 81ed7cf commit dfbae37

File tree

13 files changed

+117
-102
lines changed

13 files changed

+117
-102
lines changed

‎src/libraries/Common/src/System/Net/Http/aspnetcore/Http2/Hpack/HPackDecoder.cs

+15-15
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ internal HPackDecoder(int maxDynamicTableSize, int maxHeadersLength, DynamicTabl
118118
_headerValueOctets = new byte[DefaultStringOctetsSize];
119119
}
120120

121-
public void Decode(in ReadOnlySequence<byte> data, bool endHeaders, IHttpHeadersHandler handler)
121+
public void Decode(in ReadOnlySequence<byte> data, bool endHeaders, IHttpStreamHeadersHandler handler)
122122
{
123123
foreach (ReadOnlyMemory<byte> segment in data)
124124
{
@@ -128,13 +128,13 @@ public void Decode(in ReadOnlySequence<byte> data, bool endHeaders, IHttpHeaders
128128
CheckIncompleteHeaderBlock(endHeaders);
129129
}
130130

131-
public void Decode(ReadOnlySpan<byte> data, bool endHeaders, IHttpHeadersHandler handler)
131+
public void Decode(ReadOnlySpan<byte> data, bool endHeaders, IHttpStreamHeadersHandler handler)
132132
{
133133
DecodeInternal(data, handler);
134134
CheckIncompleteHeaderBlock(endHeaders);
135135
}
136136

137-
private void DecodeInternal(ReadOnlySpan<byte> data, IHttpHeadersHandler handler)
137+
private void DecodeInternal(ReadOnlySpan<byte> data, IHttpStreamHeadersHandler handler)
138138
{
139139
int currentIndex = 0;
140140

@@ -206,7 +206,7 @@ private void ParseDynamicTableSizeUpdate(ReadOnlySpan<byte> data, ref int curren
206206
}
207207
}
208208

209-
private void ParseHeaderValueLength(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
209+
private void ParseHeaderValueLength(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
210210
{
211211
if (currentIndex < data.Length)
212212
{
@@ -236,7 +236,7 @@ private void ParseHeaderValueLength(ReadOnlySpan<byte> data, ref int currentInde
236236
}
237237
}
238238

239-
private void ParseHeaderNameLengthContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
239+
private void ParseHeaderNameLengthContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
240240
{
241241
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
242242
{
@@ -249,7 +249,7 @@ private void ParseHeaderNameLengthContinue(ReadOnlySpan<byte> data, ref int curr
249249
}
250250
}
251251

252-
private void ParseHeaderValueLengthContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
252+
private void ParseHeaderValueLengthContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
253253
{
254254
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
255255
{
@@ -261,15 +261,15 @@ private void ParseHeaderValueLengthContinue(ReadOnlySpan<byte> data, ref int cur
261261
}
262262
}
263263

264-
private void ParseHeaderFieldIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
264+
private void ParseHeaderFieldIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
265265
{
266266
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
267267
{
268268
OnIndexedHeaderField(intResult, handler);
269269
}
270270
}
271271

272-
private void ParseHeaderNameIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
272+
private void ParseHeaderNameIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
273273
{
274274
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
275275
{
@@ -278,7 +278,7 @@ private void ParseHeaderNameIndex(ReadOnlySpan<byte> data, ref int currentIndex,
278278
}
279279
}
280280

281-
private void ParseHeaderNameLength(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
281+
private void ParseHeaderNameLength(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
282282
{
283283
if (currentIndex < data.Length)
284284
{
@@ -304,7 +304,7 @@ private void ParseHeaderNameLength(ReadOnlySpan<byte> data, ref int currentIndex
304304
}
305305
}
306306

307-
private void Parse(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
307+
private void Parse(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
308308
{
309309
if (currentIndex < data.Length)
310310
{
@@ -388,7 +388,7 @@ private void Parse(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHa
388388
}
389389
}
390390

391-
private void ParseLiteralHeaderField(ReadOnlySpan<byte> data, ref int currentIndex, byte b, byte mask, byte indexPrefix, bool index, IHttpHeadersHandler handler)
391+
private void ParseLiteralHeaderField(ReadOnlySpan<byte> data, ref int currentIndex, byte b, byte mask, byte indexPrefix, bool index, IHttpStreamHeadersHandler handler)
392392
{
393393
_headersObserved = true;
394394

@@ -415,7 +415,7 @@ private void ParseLiteralHeaderField(ReadOnlySpan<byte> data, ref int currentInd
415415
}
416416
}
417417

418-
private void ParseHeaderName(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
418+
private void ParseHeaderName(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
419419
{
420420
// Read remaining chars, up to the length of the current data
421421
int count = Math.Min(_stringLength - _stringIndex, data.Length - currentIndex);
@@ -452,7 +452,7 @@ private void ParseHeaderName(ReadOnlySpan<byte> data, ref int currentIndex, IHtt
452452
}
453453
}
454454

455-
private void ParseHeaderValue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
455+
private void ParseHeaderValue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
456456
{
457457
// Read remaining chars, up to the length of the current data
458458
int count = Math.Min(_stringLength - _stringIndex, data.Length - currentIndex);
@@ -496,7 +496,7 @@ private void CheckIncompleteHeaderBlock(bool endHeaders)
496496
}
497497
}
498498

499-
private void ProcessHeaderValue(ReadOnlySpan<byte> data, IHttpHeadersHandler handler)
499+
private void ProcessHeaderValue(ReadOnlySpan<byte> data, IHttpStreamHeadersHandler handler)
500500
{
501501
ReadOnlySpan<byte> headerValueSpan = _headerValueRange == null
502502
? _headerValueOctets.AsSpan(0, _headerValueLength)
@@ -539,7 +539,7 @@ public void CompleteDecode()
539539
}
540540
}
541541

542-
private void OnIndexedHeaderField(int index, IHttpHeadersHandler handler)
542+
private void OnIndexedHeaderField(int index, IHttpStreamHeadersHandler handler)
543543
{
544544
if (index <= H2StaticTable.Count)
545545
{

‎src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/QPack/QPackDecoder.cs

+20-20
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void Reset()
163163
_state = State.RequiredInsertCount;
164164
}
165165

166-
public void Decode(in ReadOnlySequence<byte> data, bool endHeaders, IHttpHeadersHandler handler)
166+
public void Decode(in ReadOnlySequence<byte> data, bool endHeaders, IHttpStreamHeadersHandler handler)
167167
{
168168
foreach (ReadOnlyMemory<byte> segment in data)
169169
{
@@ -172,13 +172,13 @@ public void Decode(in ReadOnlySequence<byte> data, bool endHeaders, IHttpHeaders
172172
CheckIncompleteHeaderBlock(endHeaders);
173173
}
174174

175-
public void Decode(ReadOnlySpan<byte> data, bool endHeaders, IHttpHeadersHandler handler)
175+
public void Decode(ReadOnlySpan<byte> data, bool endHeaders, IHttpStreamHeadersHandler handler)
176176
{
177177
DecodeInternal(data, handler);
178178
CheckIncompleteHeaderBlock(endHeaders);
179179
}
180180

181-
private void DecodeInternal(ReadOnlySpan<byte> data, IHttpHeadersHandler handler)
181+
private void DecodeInternal(ReadOnlySpan<byte> data, IHttpStreamHeadersHandler handler)
182182
{
183183
int currentIndex = 0;
184184

@@ -253,23 +253,23 @@ private void DecodeInternal(ReadOnlySpan<byte> data, IHttpHeadersHandler handler
253253
}
254254
}
255255

256-
private void ParseHeaderNameIndexPostBase(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
256+
private void ParseHeaderNameIndexPostBase(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
257257
{
258258
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
259259
{
260260
OnIndexedHeaderNamePostBase(intResult);
261261
}
262262
}
263263

264-
private void ParsePostBaseIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
264+
private void ParsePostBaseIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
265265
{
266266
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
267267
{
268268
OnPostBaseIndex(intResult, handler);
269269
}
270270
}
271271

272-
private void ParseHeaderNameLength(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
272+
private void ParseHeaderNameLength(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
273273
{
274274
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
275275
{
@@ -282,7 +282,7 @@ private void ParseHeaderNameLength(ReadOnlySpan<byte> data, ref int currentIndex
282282
}
283283
}
284284

285-
private void ParseHeaderName(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
285+
private void ParseHeaderName(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
286286
{
287287
// Read remaining chars, up to the length of the current data
288288
int count = Math.Min(_stringLength - _stringIndex, data.Length - currentIndex);
@@ -320,15 +320,15 @@ private void ParseHeaderName(ReadOnlySpan<byte> data, ref int currentIndex, IHtt
320320
}
321321
}
322322

323-
private void ParseHeaderFieldIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
323+
private void ParseHeaderFieldIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
324324
{
325325
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
326326
{
327327
OnIndexedHeaderField(intResult, handler);
328328
}
329329
}
330330

331-
private void ParseHeaderNameIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
331+
private void ParseHeaderNameIndex(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
332332
{
333333
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
334334
{
@@ -337,7 +337,7 @@ private void ParseHeaderNameIndex(ReadOnlySpan<byte> data, ref int currentIndex,
337337
}
338338
}
339339

340-
private void ParseHeaderValueLength(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
340+
private void ParseHeaderValueLength(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
341341
{
342342
if (currentIndex < data.Length)
343343
{
@@ -367,7 +367,7 @@ private void ParseHeaderValueLength(ReadOnlySpan<byte> data, ref int currentInde
367367
}
368368
}
369369

370-
private void ParseHeaderValue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
370+
private void ParseHeaderValue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
371371
{
372372
// Read remaining chars, up to the length of the current data
373373
int count = Math.Min(_stringLength - _stringIndex, data.Length - currentIndex);
@@ -404,7 +404,7 @@ private void ParseHeaderValue(ReadOnlySpan<byte> data, ref int currentIndex, IHt
404404
}
405405
}
406406

407-
private void ParseHeaderValueLengthContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
407+
private void ParseHeaderValueLengthContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
408408
{
409409
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
410410
{
@@ -421,7 +421,7 @@ private void ParseHeaderValueLengthContinue(ReadOnlySpan<byte> data, ref int cur
421421
}
422422
}
423423

424-
private void ParseCompressedHeaders(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
424+
private void ParseCompressedHeaders(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
425425
{
426426
if (currentIndex < data.Length)
427427
{
@@ -520,7 +520,7 @@ private void ParseCompressedHeaders(ReadOnlySpan<byte> data, ref int currentInde
520520
}
521521
}
522522

523-
private void ParseRequiredInsertCountContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
523+
private void ParseRequiredInsertCountContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
524524
{
525525
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
526526
{
@@ -529,7 +529,7 @@ private void ParseRequiredInsertCountContinue(ReadOnlySpan<byte> data, ref int c
529529
}
530530
}
531531

532-
private void ParseBase(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
532+
private void ParseBase(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
533533
{
534534
if (currentIndex < data.Length)
535535
{
@@ -549,7 +549,7 @@ private void ParseBase(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeade
549549
}
550550
}
551551

552-
private void ParseBaseContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
552+
private void ParseBaseContinue(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
553553
{
554554
if (TryDecodeInteger(data, ref currentIndex, out int intResult))
555555
{
@@ -558,7 +558,7 @@ private void ParseBaseContinue(ReadOnlySpan<byte> data, ref int currentIndex, IH
558558
}
559559
}
560560

561-
private void ParseRequiredInsertCount(ReadOnlySpan<byte> data, ref int currentIndex, IHttpHeadersHandler handler)
561+
private void ParseRequiredInsertCount(ReadOnlySpan<byte> data, ref int currentIndex, IHttpStreamHeadersHandler handler)
562562
{
563563
if (currentIndex < data.Length)
564564
{
@@ -588,7 +588,7 @@ private void CheckIncompleteHeaderBlock(bool endHeaders)
588588
}
589589
}
590590

591-
private void ProcessHeaderValue(ReadOnlySpan<byte> data, IHttpHeadersHandler handler)
591+
private void ProcessHeaderValue(ReadOnlySpan<byte> data, IHttpStreamHeadersHandler handler)
592592
{
593593
ReadOnlySpan<byte> headerValueSpan = _headerValueRange == null
594594
? _headerValueOctets.AsSpan(0, _headerValueLength)
@@ -718,7 +718,7 @@ private void OnIndexedHeaderNamePostBase(int index)
718718
// _state = State.HeaderValueLength;
719719
}
720720

721-
private void OnPostBaseIndex(int intResult, IHttpHeadersHandler handler)
721+
private void OnPostBaseIndex(int intResult, IHttpStreamHeadersHandler handler)
722722
{
723723
ThrowDynamicTableNotSupported();
724724
// TODO
@@ -743,7 +743,7 @@ private void OnRequiredInsertCount(int requiredInsertCount)
743743
_state = State.Base;
744744
}
745745

746-
private void OnIndexedHeaderField(int index, IHttpHeadersHandler handler)
746+
private void OnIndexedHeaderField(int index, IHttpStreamHeadersHandler handler)
747747
{
748748
handler.OnStaticIndexedHeader(index);
749749
_state = State.CompressedHeaders;

‎src/libraries/Common/src/System/Net/Http/aspnetcore/IHttpHeadersHandler.cs

-31
This file was deleted.

‎src/libraries/Common/src/System/Net/Http/aspnetcore/IHttpStreamHeadersHandler.cs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
namespace System.Net.Http
5+
{
6+
internal interface IHttpStreamHeadersHandler
7+
{
8+
void OnStaticIndexedHeader(int index);
9+
void OnStaticIndexedHeader(int index, ReadOnlySpan<byte> value);
10+
void OnHeader(ReadOnlySpan<byte> name, ReadOnlySpan<byte> value);
11+
void OnHeadersComplete(bool endStream);
12+
void OnDynamicIndexedHeader(int? index, ReadOnlySpan<byte> name, ReadOnlySpan<byte> value);
13+
}
14+
}

‎src/libraries/Common/tests/Common.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
Link="Common\System\Net\HttpKnownHeaderNames.cs" />
4040
<Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs"
4141
Link="Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs" />
42-
<Compile Include="$(CommonPath)System\Net\Http\aspnetcore\IHttpHeadersHandler.cs"
43-
Link="Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs" />
42+
<Compile Include="$(CommonPath)System\Net\Http\aspnetcore\IHttpStreamHeadersHandler.cs"
43+
Link="Common\System\Net\Http\aspnetcore\IHttpStreamHeadersHandler.cs" />
4444
<Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs"
4545
Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs" />
4646
<Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs"

0 commit comments

Comments
 (0)