From b155b6b7452c3fd8e5e280f0e1a21201e1506398 Mon Sep 17 00:00:00 2001 From: Naveed Khan Date: Fri, 20 Nov 2026 13:58:26 +0530 Subject: [PATCH 1/2] close connection after http/1.0 request with transfer-encoding --- .../http/impl/DefaultConnectionReuseStrategy.java | 6 ++++++ .../http/impl/TestDefaultConnectionReuseStrategy.java | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java index c7638ac55d..7dc2c6a059 100644 --- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java +++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java @@ -85,6 +85,12 @@ public boolean keepAlive( if (request.containsHeader(HttpHeaders.CONTENT_LENGTH) && request.containsHeader(HttpHeaders.TRANSFER_ENCODING)) { return false; } + // Consider framing of a HTTP/1.0 request message with Transfer-Encoding header faulty + final ProtocolVersion requestVersion = request.getVersion(); + if (requestVersion != null && requestVersion.lessEquals(HttpVersion.HTTP_1_0) + && request.containsHeader(HttpHeaders.TRANSFER_ENCODING)) { + return false; + } final Iterator it = MessageSupport.iterateTokens(request, HttpHeaders.CONNECTION); while (it.hasNext()) { final String token = it.next(); diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java index a30e34ddf0..de9d9d5aa9 100644 --- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java +++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java @@ -318,5 +318,16 @@ void testResponseHTTP10TransferEncodingPresent() { Assertions.assertThat(reuseStrategy.keepAlive(null, response, context)).isFalse(); } + @Test + void testRequestHTTP10TransferEncodingPresent() { + final HttpRequest request = new BasicHttpRequest(Method.POST, "/"); + request.setVersion(HttpVersion.HTTP_1_0); + request.addHeader("Transfer-Encoding", "chunked"); + request.addHeader("Connection", "keep-alive"); + final HttpResponse response = new BasicHttpResponse(200, "OK"); + response.addHeader("Content-Length", "2"); + Assertions.assertThat(reuseStrategy.keepAlive(request, response, context)).isFalse(); + } + } From f74be9c130cd2b7031b530bef64ffa9a61aeb145 Mon Sep 17 00:00:00 2001 From: Naveed Khan Date: Fri, 20 Nov 2026 23:24:01 +0530 Subject: [PATCH 2/2] check request content-length and transfer-encoding headers once --- .../hc/core5/http/impl/DefaultConnectionReuseStrategy.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java index 7dc2c6a059..e96fe29d79 100644 --- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java +++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/DefaultConnectionReuseStrategy.java @@ -81,14 +81,15 @@ public boolean keepAlive( Args.notNull(response, "HTTP response"); if (request != null) { + final boolean contentLenPresent = request.containsHeader(HttpHeaders.CONTENT_LENGTH); + final boolean transferEncodingPresent = request.containsHeader(HttpHeaders.TRANSFER_ENCODING); // Consider framing of a request message with both Content-Length and Content-Length headers faulty - if (request.containsHeader(HttpHeaders.CONTENT_LENGTH) && request.containsHeader(HttpHeaders.TRANSFER_ENCODING)) { + if (contentLenPresent && transferEncodingPresent) { return false; } // Consider framing of a HTTP/1.0 request message with Transfer-Encoding header faulty final ProtocolVersion requestVersion = request.getVersion(); - if (requestVersion != null && requestVersion.lessEquals(HttpVersion.HTTP_1_0) - && request.containsHeader(HttpHeaders.TRANSFER_ENCODING)) { + if (transferEncodingPresent && requestVersion != null && requestVersion.lessEquals(HttpVersion.HTTP_1_0)) { return false; } final Iterator it = MessageSupport.iterateTokens(request, HttpHeaders.CONNECTION);