From 15b2684ce31945644efdff886c22a7572197fd9d Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Sun, 28 Jun 2020 14:20:11 -0400
Subject: [PATCH] Fix error handling in SocketHttpHandler's
 ConnectHelper.Connect

---
 .../System/Net/Http/SocketsHttpHandler/ConnectHelper.cs   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs
index 867a281168797d..cacc27cb1ecc5e 100644
--- a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs
+++ b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs
@@ -101,13 +101,7 @@ private static Stream Connect(string host, int port, CancellationToken cancellat
             catch (Exception e)
             {
                 socket.Dispose();
-
-                if (CancellationHelper.ShouldWrapInOperationCanceledException(e, cancellationToken))
-                {
-                    throw CancellationHelper.CreateOperationCanceledException(e, cancellationToken);
-                }
-
-                throw;
+                throw CreateWrappedException(e, cancellationToken);
             }
 
             return new NetworkStream(socket, ownsSocket: true);