Skip to content

Do not drain HttpContentReadStream if the connection is disposed #57287

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
antonfirsov merged 4 commits into from
Aug 16, 2021
Merged

Do not drain HttpContentReadStream if the connection is disposed #57287

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5cf967
do not drain HttpContentReadStream if the connection is disposed
antonfirsov Aug 12, 2021
9e8f5ba
move _connection checking to NeedsDrain
antonfirsov Aug 13, 2021
bf57a3d
safe check of _connection._disposed
antonfirsov Aug 13, 2021
57ed154
IsConnectionAlive -> CanReadFromConnection
antonfirsov 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
4 changes: 3 additions & 1 deletion ...aries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ChunkedEncodingReadStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,9 @@ private enum ParsingState : byte
Done
}

public override bool NeedsDrain => (_connection != null);
// _connection == null typically means that we have finished reading the response.
// Cancellation may lead to a state where a disposed _connection is not null.
public override bool NeedsDrain => _connection != null && _connection._disposed != Status_Disposed;

public override async ValueTask<bool> DrainAsync(int maxDrainBytes)
{
Expand Down
4 changes: 3 additions & 1 deletion ...braries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ContentLengthReadStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,9 @@ private ReadOnlyMemory<byte> ReadFromConnectionBuffer(int maxBytesToRead)
return connectionBuffer.Slice(0, bytesToConsume);
}

public override bool NeedsDrain => (_connection != null);
// _connection == null typically means that we have finished reading the response.
// Cancellation may lead to a state where a disposed _connection is not null.
public override bool NeedsDrain => _connection != null && _connection._disposed != Status_Disposed;

public override async ValueTask<bool> DrainAsync(int maxDrainBytes)
{
Expand Down