Throw OperationCanceledException with correct CancellationToken durin…

…g QuicConnection cancellation (#95459)
dotnet · Nov 30, 2023 · ffbe1db · ffbe1db
1 parent 3805c17
commit ffbe1db
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicConnection.cs
@@ -78,12 +78,14 @@ static async ValueTask<QuicConnection> StartConnectAsync(QuicClientConnectionOpt
             {
                 await connection.FinishConnectAsync(options, linkedCts.Token).ConfigureAwait(false);
             }
-            catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
+            catch (OperationCanceledException)
             {
-                // handshake timeout elapsed, tear down the connection.
-                // Note that since handshake is not done yet, application error code is not sent.
                 await connection.DisposeAsync().ConfigureAwait(false);
 
+                // throw OCE with correct token if cancellation requested by user
+                cancellationToken.ThrowIfCancellationRequested();
+
+                // cancellation by the linkedCts.CancelAfter. Convert to Timeout
                 throw new QuicException(QuicError.ConnectionTimeout, null, SR.Format(SR.net_quic_handshake_timeout, options.HandshakeTimeout));
             }
             catch