Skip to content

[HTTP/3] Add null check in case we can't get H/3 inboundControlStream #104797

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
liveans merged 2 commits into from
Jul 13, 2024
Merged

[HTTP/3] Add null check in case we can't get H/3 inboundControlStream #104797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e56c2b
Add null check for inboundControlStream on Closing Path
liveans Jul 12, 2024
dbd5255
Enable disabled H/3 test
liveans Jul 12, 2024
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
7 changes: 5 additions & 2 deletions src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,11 @@ public async Task WaitForClientDisconnectAsync(bool refuseNewRequests = true)

// The client's control stream should throw QuicConnectionAbortedException, indicating that it was
// aborted because the connection was closed (and was not explicitly closed or aborted prior to the connection being closed)
QuicException ex = await Assert.ThrowsAsync<QuicException>(async () => await _inboundControlStream.ReadFrameAsync().ConfigureAwait(false));
Assert.Equal(QuicError.ConnectionAborted, ex.QuicError);
if (_inboundControlStream is not null)
{
QuicException ex = await Assert.ThrowsAsync<QuicException>(async () => await _inboundControlStream.ReadFrameAsync().ConfigureAwait(false));
Assert.Equal(QuicError.ConnectionAborted, ex.QuicError);
}

await CloseAsync(H3_NO_ERROR).ConfigureAwait(false);
}
Expand Down
6 changes: 0 additions & 6 deletions src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,6 @@ await RemoteExecutor.Invoke(async (useVersion, testAsync) =>
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public async Task SendAsync_ExpectedDiagnosticCancelledLogging()
{
if (UseVersion == HttpVersion30)
{
// [ActiveIssue("https://github.com/dotnet/runtime/issues/104699")]
throw new SkipTestException("SendAsync_ExpectedDiagnosticCancelledLogging is broken on HTTP/3.");
}

await RemoteExecutor.Invoke(async (useVersion, testAsync) =>
{
TaskCompletionSource responseLoggedTcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
Expand Down