WIP: SetupAutomaticPingResponse by default

src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs

@@ -80,6 +80,10 @@ public static async Task<Http2LoopbackConnection> CreateAsync(SocketWrapper sock
 
             var con = new Http2LoopbackConnection(socket, stream, timeout);
             await con.ReadPrefixAsync().ConfigureAwait(false);
+            if (httpOptions.SetupAutomaticPingResponse)
+            {
+                con.SetupAutomaticPingResponse();
+            }
 
             return con;
         }
@@ -308,6 +312,7 @@ public Task<PingFrame> ExpectPingFrameAsync(bool respond = false)
         // Starting from the time of the call, respond to all (non-ACK) PING frames which are received among other frames.
         public void SetupAutomaticPingResponse()
         {
+            if (_autoProcessPingFrames) return;
             _autoProcessPingFrames = true;
             _ = ExpectPingFrameAsync(true);
         }

src/libraries/Common/tests/System/Net/Http/Http2LoopbackServer.cs

@@ -179,6 +179,8 @@ public class Http2Options : GenericLoopbackOptions
     {
         public bool ClientCertificateRequired { get; set; }
 
+        public bool SetupAutomaticPingResponse { get; set; } = true;
+
         public Http2Options()
         {
             SslProtocols = SslProtocols.Tls12;

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

@@ -769,7 +769,6 @@ public async Task ResponseStreamFrames_HeadersAfterHeadersAndContinuationWithout
                 int streamId = await connection.ReadRequestHeaderAsync();
 
                 await connection.WriteFrameAsync(MakeSimpleHeadersFrame(streamId, endHeaders: false));
-                await connection.RespondToPingFrameAsync(); // Respond to 1 RTT PING
                 await connection.WriteFrameAsync(MakeSimpleContinuationFrame(streamId, endHeaders: false));
                 await connection.WriteFrameAsync(MakeSimpleHeadersFrame(streamId, endHeaders: false));
 
@@ -792,7 +791,6 @@ public async Task ResponseStreamFrames_DataAfterHeadersWithoutEndHeaders_Connect
                 int streamId = await connection.ReadRequestHeaderAsync();
 
                 await connection.WriteFrameAsync(MakeSimpleHeadersFrame(streamId, endHeaders: false));
-                await connection.RespondToPingFrameAsync(); // Receive 1 RTT PING
                 await connection.WriteFrameAsync(MakeSimpleDataFrame(streamId));
 
                 // As this is a connection level error, the client should see the request fail.
@@ -838,7 +836,6 @@ public async Task PingBeforeContinuationFrame_Success()
 
                 await connection.WriteFrameAsync(MakeSimpleHeadersFrame(streamId, endHeaders: false));
 
-                await connection.RespondToPingFrameAsync(); // Respond to 1 RTT PING
                 await connection.PingPong();
 
                 await connection.WriteFrameAsync(MakeSimpleContinuationFrame(streamId, endHeaders: true));
@@ -898,7 +895,6 @@ public async Task GoAwayFrame_NewRequest_NewConnection()
                 Http2LoopbackConnection connection2 = await server.EstablishConnectionAsync();
                 int streamId2 = await connection2.ReadRequestHeaderAsync();
                 await connection2.SendDefaultResponseAsync(streamId2);
-                await connection2.RespondToPingFrameAsync(); // Receive 1 RTT PING in response to HEADERS
                 HttpResponseMessage response2 = await sendTask2;
                 Assert.Equal(HttpStatusCode.OK, response2.StatusCode);
 
@@ -973,7 +969,6 @@ public async Task GoAwayFrame_UnprocessedStreamFirstRequestFinishedFirst_Request
                 // Complete second request
                 int streamId3 = await connection2.ReadRequestHeaderAsync();
                 await connection2.SendDefaultResponseAsync(streamId3);
-                await connection2.RespondToPingFrameAsync(); // Receive 1 RTT PING in response to HEADERS
                 HttpResponseMessage response2 = await sendTask2;
                 Assert.Equal(HttpStatusCode.OK, response2.StatusCode);
                 await connection2.WaitForConnectionShutdownAsync();
@@ -1010,7 +1005,6 @@ public async Task GoAwayFrame_UnprocessedStreamFirstRequestWaitsUntilSecondFinis
                 // Complete second request
                 int streamId3 = await connection2.ReadRequestHeaderAsync();
                 await connection2.SendDefaultResponseAsync(streamId3);
-                await connection2.RespondToPingFrameAsync(); // Expect 1 RTT PING in response to HEADERS
                 HttpResponseMessage response2 = await sendTask2;
                 Assert.Equal(HttpStatusCode.OK, response2.StatusCode);
                 await connection2.WaitForConnectionShutdownAsync();
@@ -1170,9 +1164,6 @@ public async Task CompletedResponse_WindowUpdateFrameReceived_Success()
                 // Send empty response.
                 await connection.SendDefaultResponseAsync(streamId);
 
-                // We expect an RTT PING in response to HEADERS:
-                await connection.RespondToPingFrameAsync();
-
                 HttpResponseMessage response = await sendTask;
                 Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
@@ -1298,9 +1289,6 @@ public async Task GoAwayFrame_NoPendingStreams_ConnectionClosed()
             {
                 (int streamId, Http2LoopbackConnection connection) = await EstablishConnectionAndProcessOneRequestAsync(client, server);
 
-                // We expect one RTT PING as a response to HEADERS
-                await connection.RespondToPingFrameAsync();
-
                 // Send GOAWAY.
                 GoAwayFrame goAwayFrame = new GoAwayFrame(streamId, 0, new byte[0], 0);
                 await connection.WriteFrameAsync(goAwayFrame);
@@ -2030,7 +2018,6 @@ public async Task Http2_WaitingForStream_Cancellation()
                 // Process first request and send response.
                 int streamId = await connection.ReadRequestHeaderAsync();
                 await connection.SendDefaultResponseAsync(streamId);
-                await connection.RespondToPingFrameAsync(); // Handle 1 RTT PING received in response to HEADERS
 
                 HttpResponseMessage response = await sendTask;
                 Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -3395,7 +3382,6 @@ await Http2LoopbackServer.CreateClientAndServerAsync(async url =>
                 Http2LoopbackConnection connection = await server.EstablishConnectionAsync();
                 (int streamId, HttpRequestData requestData) = await connection.ReadAndParseRequestHeaderAsync().ConfigureAwait(false);
                 await connection.SendResponseHeadersAsync(streamId);
-                await connection.RespondToPingFrameAsync(); // Handle 1 RTT PING in response to HEADERS
                 await sendAsyncCompleted.Task;
                 await connection.WaitForConnectionShutdownAsync();
             });