Change DiagnosticsHandler to special-case base cancellation exception (dotnet/corefx...

It should be treating all OperationCanceledExceptions as cancellation, not just TaskCanceledException.

Commit migrated from https://github.com/dotnet/corefx/commit/dd6b0669bec5ac3b72b2b3a015f42c403c3ec0f1

diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs b/src/libraries/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs
index fada51d..951f56e 100644 (file)
--- a/src/libraries/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs
@@ -111,7 +111,7 @@ namespace System.Net.Http
 
                 return await responseTask.ConfigureAwait(false);
             }
-            catch (TaskCanceledException)
+            catch (OperationCanceledException)
             {
                 // we'll report task status in HttpRequestOut.Stop
                 throw;