Skip to content

[release/6.0] [HTTP/3] Abort response stream on dispose if content not finished #57741

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

Closed
github-actions wants to merge 3 commits into from
Closed

[release/6.0] [HTTP/3] Abort response stream on dispose if content not finished #57741

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f85288
Sends abort read/write if H/3 stream is disposed before respective co…
ManickaP Aug 10, 2021
620793c
Minor tweaks in abort conditions
ManickaP Aug 12, 2021
9d3708f
Prevent reverting SendState from Aborted/ConnectionClosed back to sen…
ManickaP Aug 13, 2021
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
Prev Previous commit
Next Next commit
Minor tweaks in abort conditions
  • Loading branch information
@ManickaP
ManickaP authored and github-actions committed Aug 19, 2021
commit 620793ccdb3e4991cca3db1f43654919b365fbc7
9 changes: 2 additions & 7 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 @@ -1224,18 +1224,13 @@ public void Trace(string message, [CallerMemberName] string? memberName = null)

private void AbortStream()
{
// ToDo : locking??? we don't have any in H/3 stream, we don't have a sync root or anything.
// Check if the response body has been fully consumed.
bool requestBodyFinished = _requestContentLengthRemaining == 0; // -1 is used for unknown Content-Length, 0 for the end of content writing
bool responseBodyFinished = _responseDataPayloadRemaining == -1; // -1 is used for EOF, 0 for consumed DATA frame payload before the next read

// If the request body isn't completed, cancel it now.
if (!requestBodyFinished)
if (_requestContentLengthRemaining != 0) // 0 is used for the end of content writing, -1 is used for unknown Content-Length
{
_stream.AbortWrite((long)Http3ErrorCode.RequestCancelled);
}
// If the response body isn't completed, cancel it now.
if (!responseBodyFinished)
if (_responseDataPayloadRemaining != -1) // -1 is used for EOF, 0 for consumed DATA frame payload before the next read
{
_stream.AbortRead((long)Http3ErrorCode.RequestCancelled);
}
Expand Down