Skip to content
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

[HTTP/3] Wrap Cancelled Request with OCE instead of QuicException #103081

Merged
merged 5 commits into from
Jun 18, 2024
+11 −0
Merged

[HTTP/3] Wrap Cancelled Request with OCE instead of QuicException #103081

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f8933e
Wrap Cancelled Request with OperationCanceledException instead of thr…
liveans Jun 5, 2024
4206e61
Handle wrapping OperationAborted in OCE on ReadResponseContent
liveans Jun 12, 2024
8337ad3
Use properties from Concrete type
liveans Jun 12, 2024
0031093
Convert OCE to TCE
liveans Jun 16, 2024
d2e37e2
Add comment for throwing TCE
liveans Jun 17, 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: 7 additions & 0 deletions src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@ await Task.WhenAny(sendRequestTask, readResponseTask).ConfigureAwait(false) == s
Exception abortException = _connection.Abort(HttpProtocolException.CreateHttp3ConnectionException(code, SR.net_http_http3_connection_close));
throw new HttpRequestException(HttpRequestError.HttpProtocolError, SR.net_http_client_execution_error, abortException);
}
catch (QuicException ex) when (ex.QuicError == QuicError.OperationAborted && cancellationToken.IsCancellationRequested)
{
throw new TaskCanceledException(ex.Message, ex, cancellationToken);
}
catch (QuicException ex) when (ex.QuicError == QuicError.OperationAborted && _connection.AbortException != null)
{
// we closed the connection already, propagate the AbortException
Expand Down Expand Up @@ -1277,6 +1281,9 @@ private void HandleReadResponseContentException(Exception ex, CancellationToken
: HttpRequestError.Unknown;
throw new HttpRequestException(httpRequestError, SR.net_http_client_execution_error, _connection.AbortException);

case QuicException e when (e.QuicError == QuicError.OperationAborted && cancellationToken.IsCancellationRequested):
throw new TaskCanceledException(e.Message, e, cancellationToken);

case HttpIOException:
_connection.Abort(ex);
ExceptionDispatchInfo.Throw(ex); // Rethrow.
Expand Down
Loading