#10226 fix HTTP consumeAvailable() buffer leak and re-enable tests

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Sep 11, 2023 · 499816f · 499816f
1 parent 56b4b66
commit 499816f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
@@ -1146,6 +1146,7 @@ public Throwable consumeAvailable()
             Throwable result = HttpStream.consumeAvailable(this, getHttpConfiguration());
             if (result != null)
                 _generator.setPersistent(false);
+            releaseRequestBuffer();
             return result;
         }
 

diff --git a/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/ServerTimeoutsTest.java b/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/ServerTimeoutsTest.java
@@ -32,7 +32,6 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.util.Callback;
-import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -95,9 +94,6 @@ public boolean handle(Request request, Response response, Callback callback)
 
     @ParameterizedTest
     @MethodSource("transportsAndTrueIdleTimeoutListeners")
-    @Tag("DisableLeakTracking:server:HTTP")
-    @Tag("DisableLeakTracking:server:HTTPS")
-    @Tag("DisableLeakTracking:server:UNIX_DOMAIN")
     public void testIdleTimeoutWithDemand(Transport transport, boolean listener) throws Exception
     {
         AtomicBoolean listenerCalled = new AtomicBoolean();