huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update FrameResponseStream Cancellation

This commit is contained in:
Ben Adams 2016-01-23 10:11:46 +00:00
parent 735c0fbbef
commit 0ca8ca0328
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs
View File

@ -138,13 +138,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
case FrameStreamState.Closed:
throw new ObjectDisposedException(nameof(FrameResponseStream));
case FrameStreamState.Aborted:
if (cancellationToken.CanBeCanceled)
if (cancellationToken.IsCancellationRequested)
{
// Aborted state only throws on write if cancellationToken requests it
return TaskUtilities.GetCancelledTask(
cancellationToken.IsCancellationRequested ?
cancellationToken :
new CancellationToken(true));
return TaskUtilities.GetCancelledTask(cancellationToken);
}
break;
}