Fix #12356 Do not send keep-alive when not persistent

refactor to make less fragile
jetty · Oct 14, 2024 · 6e52cfa · 6e52cfa
1 parent 0aedc8c
commit 6e52cfa
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
@@ -788,16 +788,24 @@ else if (response != null)
             if (contentLength >= 0 && (contentLength > 0 || assumedContent || contentLengthField))
                 putContentLength(header, contentLength);
 
-            if (http11 && !connectionClose)
+            if (http11)
             {
-                if (connection == null)
-                    connection = CONNECTION_CLOSE;
-                else
-                    connection = connection.withValue(HttpHeaderValue.CLOSE.asString());
+                if (!connectionClose)
+                {
+                    if (connection == null)
+                        connection = CONNECTION_CLOSE;
+                    else
+                        connection = connection.withValue(HttpHeaderValue.CLOSE.asString());
+                    connectionClose = true;
+                }
             }
-            else if (http10 && connectionKeepAlive)
+            else if (http10)
             {
-                connection = connection.withoutValue(HttpHeaderValue.KEEP_ALIVE.asString());
+                if (connectionKeepAlive)
+                {
+                    connection = connection.withoutValue(HttpHeaderValue.KEEP_ALIVE.asString());
+                    connectionKeepAlive = false;
+                }
             }
         }
         // Else we must be a request