Fix double compress when compression enabled and compressed file exists (#8014)

CHANGES/8014.bugfix

@@ -0,0 +1 @@
+Fix double compress when compression enabled and compressed file exists

aiohttp/web_fileresponse.py

@@ -267,6 +267,10 @@ async def prepare(self, request: "BaseRequest") -> Optional[AbstractStreamWriter
             self.headers[hdrs.CONTENT_ENCODING] = encoding
         if gzip:
             self.headers[hdrs.VARY] = hdrs.ACCEPT_ENCODING
+            # Disable compression if we are already sending
+            # a compressed file since we don't want to double
+            # compress.
+            self._compression = False
 
         self.etag = etag_value  # type: ignore[assignment]
         self.last_modified = st.st_mtime  # type: ignore[assignment]

tests/test_web_sendfile_functional.py

@@ -250,7 +250,35 @@ async def handler(request):
     await client.close()
 
 
-async def test_static_file_with_content_encoding(aiohttp_client, sender) -> None:
+async def test_static_file_with_gziped_counter_part_enable_compression(
+    aiohttp_client: Any, sender: Any
+):
+    """Test that enable_compression does not double compress when a .gz file is also present."""
+    filepath = pathlib.Path(__file__).parent / "hello.txt"
+
+    async def handler(request):
+        resp = sender(filepath)
+        resp.enable_compression()
+        return resp
+
+    app = web.Application()
+    app.router.add_get("/", handler)
+    client = await aiohttp_client(app)
+
+    resp = await client.get("/")
+    assert resp.status == 200
+    body = await resp.read()
+    assert body == b"hello aiohttp\n"
+    assert resp.headers["Content-Type"] == "text/plain"
+    assert resp.headers.get("Content-Encoding") == "gzip"
+    resp.close()
+    await resp.release()
+    await client.close()
+
+
+async def test_static_file_with_content_encoding(
+    aiohttp_client: Any, sender: Any
+) -> None:
     filepath = pathlib.Path(__file__).parent / "hello.txt.gz"
 
     async def handler(request):