do not add connection: close to the response when the error is transient

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Nov 6, 2023 · 3aa877f · 3aa877f
1 parent e8f2006
commit 3aa877f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpInput.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpInput.java
@@ -349,7 +349,8 @@ public void run()
             if (LOG.isDebugEnabled())
                 LOG.debug("running failure={} {}", failure, this);
             // TODO is this necessary to add here?
-            _servletChannel.getServletContextResponse().getHeaders().add(HttpFields.CONNECTION_CLOSE);
+            if (chunk.isLast())
+                _servletChannel.getServletContextResponse().getHeaders().add(HttpFields.CONNECTION_CLOSE);
             _readListener.onError(failure);
         }
         else if (chunk.isLast() && !chunk.hasRemaining())

diff --git a/...st-integration/src/test/java/org/eclipse/jetty/ee10/test/HttpInputTransientErrorTest.java b/...st-integration/src/test/java/org/eclipse/jetty/ee10/test/HttpInputTransientErrorTest.java
@@ -179,6 +179,7 @@ public void onError(Throwable t)
             HttpTester.Response response = HttpTester.parseResponse(localEndPoint.getResponse(false, 5, TimeUnit.SECONDS));
 
             assertThat("Unexpected response status\n" + response + response.getContent(), response.getStatus(), is(HttpStatus.OK_200));
+            assertThat(response.get(HttpHeader.CONNECTION), nullValue());
             assertThat(response.get(HttpHeader.CONTENT_TYPE), is("text/plain;charset=UTF-8"));
             assertThat(response.getContent(), containsString("read=10"));
             assertInstanceOf(TimeoutException.class, failure.get());