Skip to content

Clean up the extra data frames #27750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2020
Merged

Clean up the extra data frames #27750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 0 additions & 79 deletions src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests
{
public class Http2Tests
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
private static readonly Version Win10_Regressed_DataFrame = new Version(10, 0, 20145, 0);

[ConditionalFact]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Http2 requires Win10")]
public async Task EmptyResponse_200()
Expand All @@ -53,14 +49,6 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
});

var dataFrame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: false, length: 0);

dataFrame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: true, length: 0);

h2Connection.Logger.LogInformation("Connection stopped.");
Expand Down Expand Up @@ -152,14 +140,6 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
});

var dataFrame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: false, length: 0);

dataFrame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: true, length: 0);

h2Connection.Logger.LogInformation("Connection stopped.");
Expand Down Expand Up @@ -404,14 +384,6 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
});

var dataFrame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: false, length: 0);

dataFrame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: true, length: 0);

// Http.Sys doesn't send a final GoAway unless we ignore the first one and send 200 additional streams.
Expand Down Expand Up @@ -452,14 +424,6 @@ await h2Connection.ReceiveHeadersAsync(streamId, decodedHeaders =>
});

var dataFrame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: false, length: 0);

dataFrame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyDataFrame(dataFrame, streamId, endOfStream: true, length: 0);

// Http.Sys doesn't send a final GoAway unless we ignore the first one and send 200 additional streams.
Expand All @@ -477,14 +441,6 @@ await h2Connection.ReceiveHeadersAsync(streamId, decodedHeaders =>
});

dataFrame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(dataFrame, streamId, endOfStream: false, length: 0);

dataFrame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyDataFrame(dataFrame, streamId, endOfStream: true, length: 0);
}

Expand All @@ -504,14 +460,6 @@ await h2Connection.ReceiveHeadersAsync(streamId, decodedHeaders =>
});

dataFrame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(dataFrame, streamId, endOfStream: false, length: 0);

dataFrame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyDataFrame(dataFrame, streamId, endOfStream: true, length: 0);

h2Connection.Logger.LogInformation("Connection stopped.");
Expand Down Expand Up @@ -543,14 +491,6 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
});

var dataFrame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: false, length: 0);

dataFrame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: true, length: 0);

h2Connection.Logger.LogInformation("Connection stopped.");
Expand Down Expand Up @@ -616,14 +556,6 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
});

var frame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(frame, 1, endOfStream: false, length: 0);

frame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyResetFrame(frame, expectedStreamId: 1, Http2ErrorCode.INTERNAL_ERROR);

h2Connection.Logger.LogInformation("Connection stopped.");
Expand Down Expand Up @@ -752,9 +684,6 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
Assert.Equal("200", decodedHeaders[HeaderNames.Status]);
});

var dataFrame = await h2Connection.ReceiveFrameAsync();
Http2Utilities.VerifyDataFrame(dataFrame, expectedStreamId: 1, endOfStream: false, length: 0);

var resetFrame = await h2Connection.ReceiveFrameAsync();
Http2Utilities.VerifyResetFrame(resetFrame, expectedStreamId: 1, expectedErrorCode: (Http2ErrorCode)1111);

Expand Down Expand Up @@ -1008,14 +937,6 @@ await h2Connection.ReceiveHeadersAsync(1, decodedHeaders =>
});

var dataFrame = await h2Connection.ReceiveFrameAsync();
if (Environment.OSVersion.Version >= Win10_Regressed_DataFrame)
{
// TODO: Remove when the regression is fixed.
// https://github.com/dotnet/aspnetcore/issues/23164#issuecomment-652646163
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: false, length: 0);

dataFrame = await h2Connection.ReceiveFrameAsync();
}
Http2Utilities.VerifyDataFrame(dataFrame, 1, endOfStream: true, length: 0);

var resetFrame = await h2Connection.ReceiveFrameAsync();
Expand Down