Correct fix

dotnet · Feb 22, 2019 · c1799e1 · c1799e1
1 parent 283396a
commit c1799e1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ContentLengthMessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ContentLengthMessageBody.cs
@@ -57,7 +57,6 @@ public override async ValueTask<ReadResult> ReadAsync(CancellationToken cancella
                 }
                 catch (ConnectionAbortedException ex)
                 {
-                    Log.RequestBodyDrainTimedOut(_context.ConnectionIdFeature, _context.TraceIdentifier);
                     throw new TaskCanceledException("The request was aborted", ex);
                 }
 

diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs
@@ -55,10 +55,6 @@ protected override Task OnConsumeAsync()
                 _context.SetBadRequestState(ex);
                 return Task.CompletedTask;
             }
-            catch (ConnectionAbortedException)
-            {
-                Log.RequestBodyDrainTimedOut(_context.ConnectionIdFeature, _context.TraceIdentifier);
-            }
             catch (InvalidOperationException ex)
             {
                 var connectionAbortedException = new ConnectionAbortedException(CoreStrings.ConnectionAbortedByApplication, ex);
@@ -91,7 +87,7 @@ protected async Task OnConsumeAsyncAwaited()
             {
                 _context.SetBadRequestState(ex);
             }
-            catch (ConnectionAbortedException)
+            catch (OperationCanceledException ex) when (ex is ConnectionAbortedException || ex is TaskCanceledException)
             {
                 Log.RequestBodyDrainTimedOut(_context.ConnectionIdFeature, _context.TraceIdentifier);
             }