Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2023-08-29 11:16:40 +02:00
parent 56b4b6622b
commit 499816f79c
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
View File

@ -1146,6 +1146,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Writ
Throwable result = HttpStream.consumeAvailable(this, getHttpConfiguration()); Throwable result = HttpStream.consumeAvailable(this, getHttpConfiguration());
if (result != null) if (result != null)
_generator.setPersistent(false); _generator.setPersistent(false);
releaseRequestBuffer();
return result; return result;
} }

4
jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/ServerTimeoutsTest.java
View File

@ -32,7 +32,6 @@ import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.MethodSource;
@ -95,9 +94,6 @@ public class ServerTimeoutsTest extends AbstractTest
@ParameterizedTest @ParameterizedTest
@MethodSource("transportsAndTrueIdleTimeoutListeners") @MethodSource("transportsAndTrueIdleTimeoutListeners")
@Tag("DisableLeakTracking:server:HTTP")
@Tag("DisableLeakTracking:server:HTTPS")
@Tag("DisableLeakTracking:server:UNIX_DOMAIN")
public void testIdleTimeoutWithDemand(Transport transport, boolean listener) throws Exception public void testIdleTimeoutWithDemand(Transport transport, boolean listener) throws Exception
{ {
AtomicBoolean listenerCalled = new AtomicBoolean(); AtomicBoolean listenerCalled = new AtomicBoolean();