From 2c97c5859d260847d2220657e8946484784e5ea7 Mon Sep 17 00:00:00 2001
From: catcherwong <catcher_hwq@outlook.com>
Date: Tue, 5 Nov 2019 11:02:04 +0800
Subject: [PATCH 1/2] fix 1045

---
 src/Ocelot/Requester/HttpExeptionToErrorMapper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Ocelot/Requester/HttpExeptionToErrorMapper.cs b/src/Ocelot/Requester/HttpExeptionToErrorMapper.cs
index 100d01f4..f2fbad2d 100644
--- a/src/Ocelot/Requester/HttpExeptionToErrorMapper.cs
+++ b/src/Ocelot/Requester/HttpExeptionToErrorMapper.cs
@@ -1,6 +1,6 @@
 namespace Ocelot.Requester
 {
-    using Errors;
+    using Ocelot.Errors;
     using Microsoft.Extensions.DependencyInjection;
     using System;
     using System.Collections.Generic;
@@ -23,7 +23,7 @@ namespace Ocelot.Requester
                 return _mappers[type](exception);
             }
 
-            if (type == typeof(OperationCanceledException))
+            if (type == typeof(OperationCanceledException) || type.IsSubclassOf(typeof(OperationCanceledException)))
             {
                 return new RequestCanceledError(exception.Message);
             }

From 1723076874d86ea6818dbcb67ea6d219e77dc6d7 Mon Sep 17 00:00:00 2001
From: TomPallister <tom@threemammals.com>
Date: Sun, 19 Jan 2020 17:20:36 +0000
Subject: [PATCH 2/2] test

---
 .../Requester/HttpExeptionToErrorMapperTests.cs       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/Ocelot.UnitTests/Requester/HttpExeptionToErrorMapperTests.cs b/test/Ocelot.UnitTests/Requester/HttpExeptionToErrorMapperTests.cs
index bad8668e..14413aad 100644
--- a/test/Ocelot.UnitTests/Requester/HttpExeptionToErrorMapperTests.cs
+++ b/test/Ocelot.UnitTests/Requester/HttpExeptionToErrorMapperTests.cs
@@ -38,6 +38,14 @@
             error.ShouldBeOfType<RequestCanceledError>();
         }
 
+        [Fact]
+        public void should_return_request_canceled_for_subtype()
+        {
+            var error = _mapper.Map(new SomeException());
+
+            error.ShouldBeOfType<RequestCanceledError>();
+        }
+
         [Fact]
         public void should_return_error_from_mapper()
         {
@@ -56,5 +64,8 @@
 
             error.ShouldBeOfType<AnyError>();
         }
+
+        private class SomeException : OperationCanceledException
+        { }
     }
 }