jlengrand/vert.x
1
0
Fork 0
mirror of https://github.com/jlengrand/vert.x.git synced 2026-03-10 08:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

HttpClient does not fire HttpClientRequest exception handler after receiving a 100 continue response - fixes #2936 - fixes #2910

Browse Source
This commit is contained in:
Julien Viet
2019-05-08 07:11:08 -04:00
parent 5ea4cde327
commit f25e593476
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/vertx/core/http/impl/Http1xClientConnection.java
View File

@@ -502,7 +502,7 @@ class Http1xClientConnection extends Http1xConnectionBase<WebSocketImpl> impleme
requestEnded = this.requestEnded;
}
if (request != null) {
if (response == null) {
if (response == null || response.statusCode() == 100) {
request.handleException(cause);
} else {
if (!requestEnded) {

2
src/main/java/io/vertx/core/http/impl/Http2ClientConnection.java
View File

@@ -349,7 +349,7 @@ class Http2ClientConnection extends Http2ConnectionBase implements HttpClientCon
HttpClientRequestBase req;
HttpClientResponseImpl resp;
synchronized (conn) {
req = (!requestEnded || response == null) ? request : null;
req = (!requestEnded || response == null || response.statusCode() == 100) ? request : null;
resp = response;
}
if (req != null) {

23
src/test/java/io/vertx/core/http/HttpTest.java
View File

@@ -2021,6 +2021,29 @@ public abstract class HttpTest extends HttpTestBase {
await();
}
@Test
public void test100ContinueTimeout() throws Exception {
waitFor(2);
server.close();
server = vertx.createHttpServer(createBaseServerOptions().setHandle100ContinueAutomatically(false));
server.requestHandler(req -> {
req.response().writeContinue();
});
client.close();
client = vertx.createHttpClient(createBaseClientOptions().setIdleTimeout(1));
startServer(testAddress);
client.request(HttpMethod.PUT, testAddress, DEFAULT_HTTP_PORT, DEFAULT_HTTP_HOST, DEFAULT_TEST_URI, resp -> fail()).exceptionHandler(err -> complete()).putHeader("Expect", "100-continue")
.continueHandler(v -> complete()).end();
await();
}
@Test
public void testClientDrainHandler() {
pausingServer(resumeFuture -> {