Ensure empty body responses never generate an invalid chunked response

aiohttp < 3.9.0 will generate an invalid chunked response if we reached the streaming handler for 204, 304, and a few other cases. Additionally its inefficient to send a StreamResponse when a normal Response will do. When we upgrade to 3.9.0 we should replace this check with the aiohttp must_be_empty_body helper: https://github.com/aio-libs/aiohttp/blob/8ae650bee4add9f131d49b96a0a150311ea58cd1/aiohttp/helpers.py#L1061
home-assistant · Nov 14, 2023 · 9cc29f8 · 9cc29f8
1 parent c475040
commit 9cc29f8
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/supervisor/api/ingress.py b/supervisor/api/ingress.py
@@ -256,17 +256,15 @@ async def _handle_request(
             # Simple request
             code = result.status
             if (
-                (
-                    hdrs.CONTENT_LENGTH in result.headers
-                    and int(result.headers.get(hdrs.CONTENT_LENGTH, 0)) < 4_194_000
-                )
                 # empty body responses should not be streamed,
                 # otherwise aiohttp < 3.9.0 may generate
                 # an invalid "0\r\n\r\n" chunk instead of an empty response.
                 #
                 # The below is from
                 # https://github.com/aio-libs/aiohttp/blob/8ae650bee4add9f131d49b96a0a150311ea58cd1/aiohttp/helpers.py#L1061
-                or must_be_empty_body(request.method, code)
+                must_be_empty_body(request.method, code)
+                or hdrs.CONTENT_LENGTH in result.headers
+                and int(result.headers.get(hdrs.CONTENT_LENGTH, 0)) < 4_194_000
             ):
                 # Return Response
                 body = await result.read()