You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2025/01/12 14:57:30 UTC
(httpcomponents-core) branch master updated (92d220d9f -> c897f5a85)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
discard 92d220d9f Bug fix: in some fringe cases the request may still be not fully completed while the response has already been fully committed by the client-side async HTTP/1.1 stream handler. Connections that cannot be kept alive must be closed only once both request and response streams are fully complete
new c897f5a85 Bug fix: in some fringe cases the request may still be not fully completed while the response has already been fully committed by the HTTP/1.1 stream handler. Connections that cannot be kept alive must be closed only once both request and response streams are fully complete
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (92d220d9f)
\
N -- N -- N refs/heads/master (c897f5a85)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(httpcomponents-core) 01/01: Bug fix: in some fringe cases the request may still be not fully completed while the response has already been fully committed by the HTTP/1.1 stream handler. Connections that cannot be kept alive must be closed only once both request and response streams are fully complete
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit c897f5a855750a988854396dc02f98bcb4f83db6
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sat Jan 11 12:15:51 2025 +0100
Bug fix: in some fringe cases the request may still be not fully completed while the response has already been fully committed by the HTTP/1.1 stream handler. Connections that cannot be kept alive must be closed only once both request and response streams are fully complete
---
.../hc/core5/testing/nio/Http1IntegrationTest.java | 81 +++++++++++++++++++++-
.../http/impl/nio/ClientHttp1StreamHandler.java | 9 ++-
.../http/impl/nio/ServerHttp1StreamHandler.java | 7 +-
3 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index 5665aa7aa..0655ef04a 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
@@ -123,6 +123,7 @@ import org.apache.hc.core5.http.protocol.RequestContent;
import org.apache.hc.core5.http.protocol.RequestTargetHost;
import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.apache.hc.core5.http.support.BasicRequestBuilder;
+import org.apache.hc.core5.http.support.BasicResponseBuilder;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.reactor.ProtocolIOSession;
import org.apache.hc.core5.testing.SSLTestContexts;
@@ -298,7 +299,7 @@ abstract class Http1IntegrationTest {
}
@Test
- void testPostIdentityTransferOutOfSequenceResponse() throws Exception {
+ void testPostIdentityTransferOutOfSequenceResponseNotOK() throws Exception {
final Http1TestServer server = resources.server();
final Http1TestClient client = resources.client();
@@ -336,6 +337,84 @@ abstract class Http1IntegrationTest {
}
}
+ @Test
+ void testPostOutOfSequenceResponseOK() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
+ server.register("/hello", () -> new ImmediateResponseExchangeHandler(200, "Welcome"));
+ final InetSocketAddress serverEndpoint = server.start();
+
+ final HttpHost target = target(serverEndpoint);
+
+ client.start();
+
+ final int reqNo = 5;
+
+ final Future<ClientSessionEndpoint> connectFuture = client.connect("localhost", serverEndpoint.getPort(), TIMEOUT);
+ final ClientSessionEndpoint streamEndpoint = connectFuture.get();
+
+ for (int i = 0; i < reqNo; i++) {
+ final BasicHttpRequest request = BasicRequestBuilder.post()
+ .setHttpHost(target)
+ .setPath("/hello")
+ .build();
+ final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
+ new BasicRequestProducer(request, new MultiLineEntityProducer("Hello", 512 * i)),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
+ final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+
+ Assertions.assertNotNull(result);
+ final HttpResponse response = result.getHead();
+ final String entity = result.getBody();
+ Assertions.assertNotNull(response);
+ Assertions.assertEquals(200, response.getCode());
+ Assertions.assertEquals("Welcome", entity);
+ }
+ }
+
+ @Test
+ void testPostOutOfSequenceResponseOKConnectionClose() throws Exception {
+ final Http1TestServer server = resources.server();
+ final Http1TestClient client = resources.client();
+
+ server.register("/hello", () -> new ImmediateResponseExchangeHandler(
+ BasicResponseBuilder.create(200)
+ .addHeader(HttpHeaders.CONNECTION, "Close")
+ .build(),
+ "Welcome"));
+ final InetSocketAddress serverEndpoint = server.start();
+
+ final HttpHost target = target(serverEndpoint);
+
+ client.start();
+
+ final int reqNo = 5;
+
+ for (int i = 0; i < reqNo; i++) {
+ final Future<ClientSessionEndpoint> connectFuture = client.connect("localhost", serverEndpoint.getPort(), TIMEOUT);
+ final ClientSessionEndpoint streamEndpoint = connectFuture.get();
+
+ final BasicHttpRequest request = BasicRequestBuilder.post()
+ .setHttpHost(target)
+ .setPath("/hello")
+ .build();
+ final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
+ new BasicRequestProducer(request, new MultiLineEntityProducer("Hello", 512 * i)),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
+ final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+
+ streamEndpoint.close();
+
+ Assertions.assertNotNull(result);
+ final HttpResponse response = result.getHead();
+ final String entity = result.getBody();
+ Assertions.assertNotNull(response);
+ Assertions.assertEquals(200, response.getCode());
+ Assertions.assertEquals("Welcome", entity);
+ }
+ }
+
@Test
void testSimpleGetsPipelined() throws Exception {
final Http1TestServer server = resources.server();
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
index 62dd4c242..18cc5af96 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
@@ -91,8 +91,11 @@ class ClientHttp1StreamHandler implements ResourceHolder {
@Override
public void endStream(final List<? extends Header> trailers) throws IOException {
- outputChannel.complete(trailers);
requestState = MessageState.COMPLETE;
+ if (!keepAlive && responseState == MessageState.COMPLETE) {
+ outputChannel.close();
+ }
+ outputChannel.complete(trailers);
}
@Override
@@ -269,10 +272,10 @@ class ClientHttp1StreamHandler implements ResourceHolder {
if (done.get() || responseState != MessageState.BODY) {
throw new ProtocolException("Unexpected message data");
}
- if (!keepAlive) {
+ responseState = MessageState.COMPLETE;
+ if (!keepAlive && requestState == MessageState.COMPLETE) {
outputChannel.close();
}
- responseState = MessageState.COMPLETE;
exchangeHandler.streamEnd(trailers);
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
index 51d35a9c6..d8fec2744 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
@@ -100,10 +100,10 @@ class ServerHttp1StreamHandler implements ResourceHolder {
@Override
public void endStream(final List<? extends Header> trailers) throws IOException {
outputChannel.complete(trailers);
- if (!keepAlive) {
+ responseState = MessageState.COMPLETE;
+ if (requestState == MessageState.COMPLETE && !keepAlive) {
outputChannel.close();
}
- responseState = MessageState.COMPLETE;
}
@Override
@@ -324,6 +324,9 @@ class ServerHttp1StreamHandler implements ResourceHolder {
throw new ProtocolException("Unexpected message data");
}
requestState = MessageState.COMPLETE;
+ if (responseState == MessageState.COMPLETE && !keepAlive) {
+ outputChannel.close();
+ }
exchangeHandler.streamEnd(trailers);
}