Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

Signed-off-by: Ludovic Orban <lorban@bitronix.be>

jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpChannelOverHTTP2.java

@@ -209,11 +209,13 @@ public HttpTransportOverHTTP2 getHttpTransport()
     @Override
     public void recycle()
     {
+        super.recycle();
+        getHttpTransport().recycle();
         _expect100Continue = false;
         _delayedUntilContent = false;
+        // The content demander must be the very last thing to be recycled
+        // to make sure any pending demanding content gets cleared off.
         _contentDemander.recycle();
-        super.recycle();
-        getHttpTransport().recycle();
     }
 
     @Override

tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/RequestReaderTest.java

@@ -0,0 +1,80 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.http.client;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.client.api.ContentResponse;
+import org.eclipse.jetty.client.util.BytesRequestContent;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+public class RequestReaderTest extends AbstractTest<TransportScenario>
+{
+    @Override
+    public void init(Transport transport) throws IOException
+    {
+        setScenario(new TransportScenario(transport));
+    }
+
+    @ParameterizedTest
+    @ArgumentsSource(TransportProvider.class)
+    public void testRecyclingWhenUsingReader(Transport transport) throws Exception
+    {
+        init(transport);
+        scenario.start(new AbstractHandler()
+        {
+            @Override
+            public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException
+            {
+                // Must be a Reader and not an InputStream.
+                BufferedReader br = request.getReader();
+                while (true)
+                {
+                    int b = br.read();
+                    if (b == -1)
+                        break;
+                }
+                // Paranoid check.
+                assertThat(br.read(), is(-1));
+                baseRequest.setHandled(true);
+            }
+        }, client -> {});
+
+        ContentResponse response1 = scenario.client.newRequest(scenario.newURI())
+            .method("POST")
+            .timeout(5, TimeUnit.SECONDS)
+            .body(new BytesRequestContent(new byte[512]))
+            .send();
+        assertThat(response1.getStatus(), is(HttpStatus.OK_200));
+
+        // Send a 2nd request to make sure recycling works.
+        ContentResponse response2 = scenario.client.newRequest(scenario.newURI())
+            .method("POST")
+            .timeout(5, TimeUnit.SECONDS)
+            .body(new BytesRequestContent(new byte[512]))
+            .send();
+        assertThat(response2.getStatus(), is(HttpStatus.OK_200));
+    }
+}