From 45147c4e18d20ee7a4007fb3ee399487e319d9ad Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 23 Nov 2023 11:52:16 +0100
Subject: [PATCH] Fix ClientResponse.close releasing the connection instead of
 closing (#7869) (#7874)

(cherry picked from commit 25ef450238864d06ba8a44227080e4a7b354ba76)
---
 CHANGES/7869.bugfix             |  1 +
 aiohttp/client_reqrep.py        |  4 +++-
 tests/test_client_functional.py | 36 ++++++++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 CHANGES/7869.bugfix

diff --git a/CHANGES/7869.bugfix b/CHANGES/7869.bugfix
new file mode 100644
index 00000000000..23282fc3bb4
--- /dev/null
+++ b/CHANGES/7869.bugfix
@@ -0,0 +1 @@
+Fix ClientResponse.close releasing the connection instead of closing
diff --git a/aiohttp/client_reqrep.py b/aiohttp/client_reqrep.py
index 4cea7466d8d..0ab84743658 100644
--- a/aiohttp/client_reqrep.py
+++ b/aiohttp/client_reqrep.py
@@ -1033,7 +1033,9 @@ def close(self) -> None:
             return
 
         self._cleanup_writer()
-        self._release_connection()
+        if self._connection is not None:
+            self._connection.close()
+            self._connection = None
 
     def release(self) -> Any:
         if not self._released:
diff --git a/tests/test_client_functional.py b/tests/test_client_functional.py
index c5379e74a4b..6698ac6ef52 100644
--- a/tests/test_client_functional.py
+++ b/tests/test_client_functional.py
@@ -19,6 +19,7 @@
 from aiohttp import Fingerprint, ServerFingerprintMismatch, hdrs, web
 from aiohttp.abc import AbstractResolver
 from aiohttp.client_exceptions import TooManyRedirects
+from aiohttp.pytest_plugin import AiohttpClient, TestClient
 from aiohttp.test_utils import unused_port
 
 
@@ -3186,7 +3187,40 @@ async def handler(request):
         await client.get("/")
 
 
-async def test_read_timeout_on_prepared_response(aiohttp_client) -> None:
+async def test_read_timeout_closes_connection(aiohttp_client: AiohttpClient) -> None:
+    request_count = 0
+
+    async def handler(request):
+        nonlocal request_count
+        request_count += 1
+        if request_count < 3:
+            await asyncio.sleep(0.5)
+        return web.Response(body=f"request:{request_count}")
+
+    app = web.Application()
+    app.add_routes([web.get("/", handler)])
+
+    timeout = aiohttp.ClientTimeout(total=0.1)
+    client: TestClient = await aiohttp_client(app, timeout=timeout)
+    with pytest.raises(asyncio.TimeoutError):
+        await client.get("/")
+
+    # Make sure its really closed
+    assert not client.session.connector._conns
+
+    with pytest.raises(asyncio.TimeoutError):
+        await client.get("/")
+
+    # Make sure its really closed
+    assert not client.session.connector._conns
+    result = await client.get("/")
+    assert await result.read() == b"request:3"
+
+    # Make sure its not closed
+    assert client.session.connector._conns
+
+
+async def test_read_timeout_on_prepared_response(aiohttp_client: Any) -> None:
     async def handler(request):
         resp = aiohttp.web.StreamResponse()
         await resp.prepare(request)