Don't set connection close headers when they are already set on the R…

…esponse

h11/_connection.py

@@ -622,8 +622,9 @@ def _clean_up_response_headers_for_sending(self, response: Response) -> Response
             # Make sure Connection: close is set
             connection = set(get_comma_header(headers, b"connection"))
             connection.discard(b"keep-alive")
-            connection.add(b"close")
-            headers = set_comma_header(headers, b"connection", sorted(connection))
+            if b"close" not in connection:
+                connection.add(b"close")
+                headers = set_comma_header(headers, b"connection", sorted(connection))
 
         return Response(
             headers=headers,

h11/tests/test_connection.py

@@ -7,7 +7,6 @@
     ConnectionClosed,
     Data,
     EndOfMessage,
-    Event,
     InformationalResponse,
     Request,
     Response,
@@ -17,7 +16,6 @@
     CLOSED,
     DONE,
     ERROR,
-    IDLE,
     MIGHT_SWITCH_PROTOCOL,
     MUST_CLOSE,
     SEND_BODY,
@@ -1120,3 +1118,8 @@ def test_special_exceptions_for_lost_connection_in_message_body() -> None:
     with pytest.raises(RemoteProtocolError) as excinfo:
         c.next_event()
     assert "incomplete chunked read" in str(excinfo.value)
+
+def test_ensure_connection_close_remains_untouched() -> None:
+    c = Connection(SERVER)
+    data = c.send(Response(status_code=200, headers=[(b"connection", b"close")]))  # type: ignore[arg-type]
+    assert data == b"HTTP/1.1 200 \r\n" b"connection: close\r\n\r\n"