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

fix HttpChannelOverHTTP2 recycling order to make sure no demanding content can be left pending 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2021-05-19 15:33:23 +02:00
parent 65ef393262
commit 6ed64e1e65
3 changed files with 87 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,11 +209,13 @@ public class HttpChannelOverHTTP2 extends HttpChannel implements Closeable, Writ
@Override
public void recycle()
{
_expect100Continue = false;
_delayedUntilContent = false;
_contentDemander.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();
}
@Override

5
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
View File

@ -55,8 +55,7 @@ public class HttpInput extends ServletInputStream implements Runnable
public void recycle()
{
if (LOG.isDebugEnabled())
LOG.debug("recycle {}", this);
reopen();
}
public void reopen()
@ -64,7 +63,7 @@ public class HttpInput extends ServletInputStream implements Runnable
try (AutoLock lock = _contentProducer.lock())
{
if (LOG.isDebugEnabled())
LOG.debug("reopen {}", this);
LOG.debug("recycle/reopen {}", this);
_blockingContentProducer.recycle();
_contentProducer = _blockingContentProducer;
_consumedEof = false;

80
tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/RequestReaderTest.java Normal file
View File

@ -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 javax.servlet.http.HttpServletRequest;
import javax.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;
}
baseRequest.setHandled(true);
}
}, client -> {});
ContentResponse response1 = scenario.client.newRequest("localhost", scenario.server.getURI().getPort())
.scheme(scenario.server.getURI().getScheme())
.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("localhost", scenario.server.getURI().getPort())
.scheme(scenario.server.getURI().getScheme())
.method("POST")
.timeout(5, TimeUnit.SECONDS)
.body(new BytesRequestContent(new byte[512]))
.send();
assertThat(response2.getStatus(), is(HttpStatus.OK_200));
}
}