Add missing Shutdown calls in HTTP loopback servers (#25694)

Author: stephentoub

src/Common/tests/System/Net/Http/LoopbackServer.cs

@@ -89,7 +89,7 @@ public static Task<List<string>> ReadRequestAndSendResponseAsync(Socket server,
             return AcceptSocketAsync(server, (s, stream, reader, writer) => ReadWriteAcceptedAsync(s, reader, writer, response), options);
         }
 
-        public static async Task<List<string>> ReadWriteAcceptedAsync(Socket s, StreamReader reader, StreamWriter writer, string response = null, bool shutdown = true)
+        public static async Task<List<string>> ReadWriteAcceptedAsync(Socket s, StreamReader reader, StreamWriter writer, string response = null)
         {
             // Read request line and headers. Skip any request body.
             var lines = new List<string>();
@@ -101,11 +101,6 @@ public static async Task<List<string>> ReadWriteAcceptedAsync(Socket s, StreamRe
 
             await writer.WriteAsync(response ?? DefaultHttpResponse).ConfigureAwait(false);
 
-            if (shutdown)
-            {
-                s.Shutdown(SocketShutdown.Send);
-            }
-
             return lines;
         }
 
@@ -157,7 +152,8 @@ private static string ComputeWebSocketHandshakeSecurityAcceptValue(string secWeb
         public static async Task<List<string>> AcceptSocketAsync(Socket server, Func<Socket, Stream, StreamReader, StreamWriter, Task<List<string>>> funcAsync, Options options = null)
         {
             options = options ?? new Options();
-            using (Socket s = await server.AcceptAsync().ConfigureAwait(false))
+            Socket s = await server.AcceptAsync().ConfigureAwait(false);
+            try
             {
                 Stream stream = new NetworkStream(s, ownsSocket: false);
                 if (options.UseSsl)
@@ -166,9 +162,9 @@ public static async Task<List<string>> AcceptSocketAsync(Socket server, Func<Soc
                     using (var cert = Configuration.Certificates.GetServerCertificate())
                     {
                         await sslStream.AuthenticateAsServerAsync(
-                            cert, 
+                            cert,
                             clientCertificateRequired: true, // allowed but not required
-                            enabledSslProtocols: options.SslProtocols, 
+                            enabledSslProtocols: options.SslProtocols,
                             checkCertificateRevocation: false).ConfigureAwait(false);
                     }
                     stream = sslStream;
@@ -180,6 +176,18 @@ await sslStream.AuthenticateAsServerAsync(
                     return await funcAsync(s, stream, reader, writer).ConfigureAwait(false);
                 }
             }
+            finally
+            {
+                try
+                {
+                    s.Shutdown(SocketShutdown.Send);
+                    s.Dispose();
+                }
+                catch (ObjectDisposedException)
+                {
+                    // In case the test itself disposes of the socket
+                }
+            }
         }
 
         public enum TransferType
@@ -250,8 +258,6 @@ public static Task StartTransferTypeAndErrorServer(
                     await writer.WriteAsync($"{content}\r\n").ConfigureAwait(false);
                 }
 
-                client.Shutdown(SocketShutdown.Both);
-                
                 return null;
             }), out localEndPoint);
         }        

src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs

@@ -1213,7 +1213,7 @@ await LoopbackServer.CreateServerAsync(async (server, url) =>
                     Task serverTask =
                         LoopbackServer.AcceptSocketAsync(server, async (s, stream, reader, writer) =>
                         {
-                            var list = await LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer, partialResponse, shutdown: false);
+                            var list = await LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer, partialResponse);
                             await tcs.Task;
                             return list;
                         }, null);

src/System.Net.Http/tests/FunctionalTests/LoopbackGetRequestHttpProxy.cs

@@ -44,6 +44,12 @@ private static async Task<ProxyResult> StartAsync(TcpListener listener, bool req
             {
                 // Get and parse the incoming request.
                 Func<Task> getAndReadRequest = async () => {
+                    if (clientSocket != null)
+                    {
+                        clientSocket.Shutdown(SocketShutdown.Send);
+                        clientSocket.Dispose();
+                    }
+
                     clientSocket = await listener.AcceptSocketAsync().ConfigureAwait(false);
                     clientStream = new NetworkStream(clientSocket, ownsSocket: false);
                     clientReader = new StreamReader(clientStream, Encoding.ASCII);
@@ -68,9 +74,6 @@ await clientSocket.SendAsync(
                         new ArraySegment<byte>(Encoding.ASCII.GetBytes("HTTP/1.1 407 Proxy Auth Required\r\nProxy-Authenticate: Basic\r\n\r\n")),
                         SocketFlags.None).ConfigureAwait(false);
 
-                    clientSocket.Shutdown(SocketShutdown.Send);
-                    clientSocket.Dispose();
-
                     if (expectCreds)
                     {
                         // Wait for a new connection that should have an auth header this time and parse it.
@@ -127,6 +130,7 @@ await clientSocket.SendAsync(
             }
             finally
             {
+                clientSocket.Shutdown(SocketShutdown.Send);
                 clientSocket.Dispose();
                 listener.Stop();
             }