From 0ca8ca03286948c3cb9d1ffafed8f0dd8fb387df Mon Sep 17 00:00:00 2001 From: Ben Adams Date: Sat, 23 Jan 2016 10:11:46 +0000 Subject: [PATCH] Update FrameResponseStream Cancellation --- .../Http/FrameResponseStream.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs index d5b4f41aea..606c112d36 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs @@ -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; }