Properly cascade cancelation during connect by name

dotnet · Jul 9, 2024 · 5e25367 · 5e25367
1 parent 01e3d29
commit 5e25367
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.cs
@@ -428,6 +428,13 @@ internal void SetResults(Exception exception, int bytesTransferred, SocketFlags
                 {
                     _socketError = socketException.SocketErrorCode;
                 }
+                else if (exception is OperationCanceledException)
+                {
+                    // Preserver information about the cancellation
+                    // when it is canceled at non Socket operation.
+                    // It will be later used to throw the right exception.
+                    _socketError = SocketError.OperationAborted;
+                }
                 else
                 {
                     _socketError = SocketError.SocketError;