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

Fixes #7117 - Timeout with Expect 100 continue when using ProxyServlet. (#8873) 

* Fixes #7117 - Timeout with Expect 100 continue when using ProxyServlet.

Now getReader() tests whether it has to send a 100 continue in case getInputStream() 
is not called because the reader is reused.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2022-11-09 12:16:42 +01:00 committed by GitHub
parent f21fa6e6e9
commit c280e31b46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
View File

@ -19,6 +19,7 @@ import java.io.InputStream;
import java.io.InterruptedIOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.Writer;
import java.net.ConnectException;
import java.net.HttpCookie;
import java.nio.ByteBuffer;
@ -1637,4 +1638,36 @@ public class ProxyServletTest
assertFalse(contentLatch.await(1, TimeUnit.SECONDS));
assertTrue(clientLatch.await(5, TimeUnit.SECONDS));
}
@ParameterizedTest
@MethodSource("impls")
public void testExpect100ContinueWithReader(Class<? extends ProxyServlet> proxyServletClass) throws Exception
{
startServer(new EmptyHttpServlet()
{
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException
{
// Calling getReader() should trigger the send of 100 Continue.
IO.copy(request.getReader(), Writer.nullWriter());
}
});
startProxy(proxyServletClass);
startClient();
client.setMaxConnectionsPerDestination(1);
// Perform consecutive requests to test whether recycling of
// the Request on server side messes up 100 Continue handling.
int count = 8;
for (int i = 0; i < count; ++i)
{
ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort())
.path("/" + i)
.headers(headers -> headers.put(HttpHeader.EXPECT, HttpHeaderValue.CONTINUE.asString()))
.body(new BytesRequestContent(new byte[]{'h', 'e', 'l', 'l', 'o'}))
.timeout(5, TimeUnit.SECONDS)
.send();
assertEquals(HttpStatus.OK_200, response.getStatus());
}
}
}

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

@ -1161,17 +1161,23 @@ public class Request implements HttpServletRequest
if (_reader == null || !encoding.equalsIgnoreCase(_readerEncoding))
{
final ServletInputStream in = getInputStream();
ServletInputStream in = getInputStream();
_readerEncoding = encoding;
_reader = new BufferedReader(new InputStreamReader(in, encoding))
{
@Override
public void close() throws IOException
{
// Do not call super to avoid marking this reader as closed,
// but do close the ServletInputStream that can be reopened.
in.close();
}
};
}
else if (_channel.isExpecting100Continue())
{
_channel.continue100(_input.available());
}
_inputState = INPUT_READER;
return _reader;
}