rework SocketsHttpHandler request queue handling for HTTP/1.1 and HTT…

…P/2 (#53851)

* rework SocketsHttpHandler request queue handling for HTTP/1.1 and HTTP/2

Co-authored-by: Geoffrey Kizer <[email protected]>

src/libraries/Common/src/System/Threading/Tasks/TaskCompletionSourceWithCancellation.cs

@@ -21,5 +21,20 @@ public async ValueTask<T> WaitWithCancellationAsync(CancellationToken cancellati
                 return await Task.ConfigureAwait(false);
             }
         }
+
+        public T WaitWithCancellation(CancellationToken cancellationToken)
+        {
+            using (cancellationToken.UnsafeRegister(static (s, cancellationToken) => ((TaskCompletionSourceWithCancellation<T>)s!).TrySetCanceled(cancellationToken), this))
+            {
+                return Task.GetAwaiter().GetResult();
+            }
+        }
+
+        public ValueTask<T> WaitWithCancellationAsync(bool async, CancellationToken cancellationToken)
+        {
+            return async ?
+                WaitWithCancellationAsync(cancellationToken) :
+                new ValueTask<T>(WaitWithCancellation(cancellationToken));
+        }
     }
 }

src/libraries/Common/tests/System/Diagnostics/Tracing/ConsoleEventListener.cs

@@ -32,7 +32,7 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
         {
             lock (Console.Out)
             {
-                string text = $"[{eventData.EventSource.Name}-{eventData.EventId}]{(eventData.Payload != null ? $" ({string.Join(", ", eventData.Payload)})." : "")}";
+                string text = $"[{eventData.EventSource.Name}-{eventData.EventName}]{(eventData.Payload != null ? $" ({string.Join(", ", eventData.Payload)})." : "")}";
                 if (_eventFilter != null && text.Contains(_eventFilter))
                 {
                     ConsoleColor origForeground = Console.ForegroundColor;

src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs

@@ -315,7 +315,7 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async url =>
                 using (HttpClient client = CreateHttpClient(handler))
                 {
                     client.DefaultRequestHeaders.ConnectionClose = true; // to avoid issues with connection pooling
-                    await client.GetAsync(url1);
+                        await client.GetAsync(url1);
                 }
             },
             async server =>

src/libraries/System.Net.Http/src/Resources/Strings.resx

@@ -540,6 +540,9 @@
   <data name="net_http_request_timedout" xml:space="preserve">
     <value>The request was canceled due to the configured HttpClient.Timeout of {0} seconds elapsing.</value>
   </data>
+  <data name="net_http_connect_timedout" xml:space="preserve">
+    <value>A connection could not be established within the configured ConnectTimeout.</value>
+  </data>
   <data name="net_quic_connectionaborted" xml:space="preserve">
     <value>Connection aborted by peer ({0}).</value>
   </data>

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.NtAuth.cs

@@ -63,8 +63,12 @@ private static async Task<HttpResponseMessage> SendWithNtAuthAsync(HttpRequestMe
                         if (response.Headers.ConnectionClose.GetValueOrDefault())
                         {
                             // Server is closing the connection and asking us to authenticate on a new connection.
+
+                            // First, detach the current connection from the pool. This means it will no longer count against the connection limit.
+                            // Instead, it will be replaced by the new connection below.
+                            connection.DetachFromPool();
+
                             connection = await connectionPool.CreateHttp11ConnectionAsync(request, async, cancellationToken).ConfigureAwait(false);
-                            connectionPool.IncrementConnectionCount();
                             connection!.Acquire();
                             isNewConnection = true;
                             needDrain = false;