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 c7638ac55..e96fe29d7 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,8 +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 (transferEncodingPresent && requestVersion != null && requestVersion.lessEquals(HttpVersion.HTTP_1_0)) { return false; } final Iterator it = MessageSupport.iterateTokens(request, HttpHeaders.CONNECTION); 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 a30e34ddf..de9d9d5aa 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(); + } + }