Skip to content

Commit 58332b7

Browse files
Merge commit 'd5dc8a13cc618b9cbdc1e5744b4806c594d49553' into internal-merge-9.0-2025-04-08-1156
2 parents 0ace539 + d5dc8a1 commit 58332b7

22 files changed

+842
-400
lines changed

NuGet.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-int-dotnet-runtime-f57e6dc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f57e6dc7/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-runtime -->
89
<!-- Begin: Package sources from dotnet-efcore -->
10+
<add key="darc-int-dotnet-efcore-9275e9a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-9275e9ac/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-efcore -->
1012
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1113
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -28,8 +30,10 @@
2830
<clear />
2931
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3032
<!-- Begin: Package sources from dotnet-efcore -->
33+
<add key="darc-int-dotnet-efcore-9275e9a" value="true" />
3134
<!-- End: Package sources from dotnet-efcore -->
3235
<!-- Begin: Package sources from dotnet-runtime -->
36+
<add key="darc-int-dotnet-runtime-f57e6dc" value="true" />
3337
<!-- End: Package sources from dotnet-runtime -->
3438
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3539
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 160 additions & 160 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 80 additions & 80 deletions
Large diffs are not rendered by default.

src/Servers/Kestrel/Core/src/CoreStrings.resx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,4 +737,7 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l
737737
<data name="NeedHttpsConfigurationToBindHttpsAddresses" xml:space="preserve">
738738
<value>Call UseKestrelHttpsConfiguration() on IWebHostBuilder to automatically enable HTTPS when an https:// address is used.</value>
739739
</data>
740-
</root>
740+
<data name="Http3ControlStreamFrameTooLarge" xml:space="preserve">
741+
<value>The client sent a {frameType} frame to a control stream that was too large.</value>
742+
</data>
743+
</root>

src/Servers/Kestrel/Core/src/Http3Limits.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal int HeaderTableSize
3737
/// <summary>
3838
/// Indicates the size of the maximum allowed size of a request header field sequence. This limit applies to both name and value sequences in their compressed and uncompressed representations.
3939
/// <para>
40-
/// Value must be greater than 0, defaults to 2^14 (16,384).
40+
/// Value must be greater than 0, defaults to 2^15 (32,768).
4141
/// </para>
4242
/// </summary>
4343
public int MaxRequestHeaderFieldSize

src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Data.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal partial class Http3RawFrame
77
{
88
public void PrepareData()
99
{
10-
Length = 0;
10+
RemainingLength = 0;
1111
Type = Http3FrameType.Data;
1212
}
1313
}

src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.GoAway.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal partial class Http3RawFrame
77
{
88
public void PrepareGoAway()
99
{
10-
Length = 0;
10+
RemainingLength = 0;
1111
Type = Http3FrameType.GoAway;
1212
}
1313
}

src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Headers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal partial class Http3RawFrame
77
{
88
public void PrepareHeaders()
99
{
10-
Length = 0;
10+
RemainingLength = 0;
1111
Type = Http3FrameType.Headers;
1212
}
1313
}

src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ internal partial class Http3RawFrame
77
{
88
public void PrepareSettings()
99
{
10-
Length = 0;
10+
RemainingLength = 0;
1111
Type = Http3FrameType.Settings;
1212
}
1313
}

src/Servers/Kestrel/Core/src/Internal/Http3/Frames/Http3RawFrame.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ namespace System.Net.Http;
99
internal partial class Http3RawFrame
1010
#pragma warning restore CA1852 // Seal internal types
1111
{
12-
public long Length { get; set; }
12+
public long RemainingLength { get; set; }
1313

1414
public Http3FrameType Type { get; internal set; }
1515

1616
public string FormattedType => Http3Formatting.ToFormattedType(Type);
1717

1818
public override string ToString()
1919
{
20-
return $"{FormattedType} Length: {Length}";
20+
return $"{FormattedType} Length: {RemainingLength}";
2121
}
2222
}

0 commit comments

Comments
 (0)