Revert "Fix potential Debug.Assert in QuicListener (#103965)"

rzikm · web-flow · commit 1edae9fe493d · 2024-06-28T16:21:43.000+02:00
This reverts commit 2fab73c.
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicListener.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/QuicListener.cs
@@ -225,9 +225,9 @@ private async void StartConnectionHandshake(QuicConnection connection, SslClient
         // https://github.com/microsoft/msquic/discussions/2705.
         // This will be assigned to before the linked CTS is cancelled
         TimeSpan handshakeTimeout = QuicDefaults.HandshakeTimeout;
-        using CancellationTokenSource linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_disposeCts.Token, connection.ConnectionShutdownToken);
         try
         {
+            using CancellationTokenSource linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_disposeCts.Token, connection.ConnectionShutdownToken);
             cancellationToken = linkedCts.Token;
             // Initial timeout for retrieving connection options.
             linkedCts.CancelAfter(handshakeTimeout);
@@ -249,7 +249,7 @@ private async void StartConnectionHandshake(QuicConnection connection, SslClient
                 await connection.DisposeAsync().ConfigureAwait(false);
             }
         }
-        catch (OperationCanceledException) when (connection.ConnectionShutdownToken.IsCancellationRequested && !linkedCts.IsCancellationRequested)
+        catch (OperationCanceledException) when (connection.ConnectionShutdownToken.IsCancellationRequested)
         {
             // Connection closed by peer
             if (NetEventSource.Log.IsEnabled())

Original file line number	Diff line number	Diff line change
`@@ -225,9 +225,9 @@ private async void StartConnectionHandshake(QuicConnection connection, SslClient`
`225`	`225`	`// https://github.com/microsoft/msquic/discussions/2705.`
`226`	`226`	`// This will be assigned to before the linked CTS is cancelled`
`227`	`227`	`TimeSpan handshakeTimeout = QuicDefaults.HandshakeTimeout;`
`228`		`- using CancellationTokenSource linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_disposeCts.Token, connection.ConnectionShutdownToken);`
`229`	`228`	`try`
`230`	`229`	`{`
	`230`	`+ using CancellationTokenSource linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_disposeCts.Token, connection.ConnectionShutdownToken);`
`231`	`231`	`cancellationToken = linkedCts.Token;`
`232`	`232`	`// Initial timeout for retrieving connection options.`
`233`	`233`	`linkedCts.CancelAfter(handshakeTimeout);`
`@@ -249,7 +249,7 @@ private async void StartConnectionHandshake(QuicConnection connection, SslClient`
`249`	`249`	`await connection.DisposeAsync().ConfigureAwait(false);`
`250`	`250`	`}`
`251`	`251`	`}`
`252`		`- catch (OperationCanceledException) when (connection.ConnectionShutdownToken.IsCancellationRequested && !linkedCts.IsCancellationRequested)`
	`252`	`+ catch (OperationCanceledException) when (connection.ConnectionShutdownToken.IsCancellationRequested)`
`253`	`253`	`{`
`254`	`254`	`// Connection closed by peer`
`255`	`255`	`if (NetEventSource.Log.IsEnabled())`