Add METH_QUERY and treat QUERY as an idempotent method (aio-libs#13301)

Author: rodrigobnogueira

aiohttp/client.py

@@ -216,7 +216,10 @@ class _WSConnectOptions(TypedDict, total=False):
 
 
 # https://www.rfc-editor.org/rfc/rfc9110#section-9.2.2
-IDEMPOTENT_METHODS = frozenset({"GET", "HEAD", "OPTIONS", "TRACE", "PUT", "DELETE"})
+# https://www.rfc-editor.org/info/rfc10008/#section-1-12
+IDEMPOTENT_METHODS = frozenset(
+    {"GET", "HEAD", "OPTIONS", "TRACE", "PUT", "DELETE", "QUERY"}
+)
 
 _RetType_co = TypeVar(
     "_RetType_co",

aiohttp/hdrs.py

@@ -16,6 +16,7 @@
 METH_PATCH: Final[str] = "PATCH"
 METH_POST: Final[str] = "POST"
 METH_PUT: Final[str] = "PUT"
+METH_QUERY: Final[str] = "QUERY"
 METH_TRACE: Final[str] = "TRACE"
 
 METH_ALL: Final[set[str]] = {

tests/test_test_utils.py

@@ -12,7 +12,7 @@
 from yarl import URL
 
 import aiohttp
-from aiohttp import web
+from aiohttp import hdrs, web
 from aiohttp.helpers import HeadersDictProxy
 from aiohttp.test_utils import (
     REUSE_ADDRESS,
@@ -356,6 +356,29 @@ async def handler(request: web.Request) -> web.Response:
     assert num_requests == 2
 
 
+async def test_retry_persistent_connection_query_method(
+    aiohttp_client: AiohttpClient,
+) -> None:
+    """QUERY is safe and idempotent, so it must trigger retry."""
+    num_requests = 0
+
+    async def handler(request: web.Request) -> web.Response:
+        nonlocal num_requests
+        num_requests += 1
+        if num_requests == 1:
+            request.protocol.force_close()
+        return web.Response()
+
+    app = web.Application()
+    app.router.add_route(hdrs.METH_QUERY, "/", handler)
+    client = await aiohttp_client(app)
+    client.session._retry_connection = True
+    async with client.request(hdrs.METH_QUERY, "/") as resp:
+        assert resp.status == 200
+
+    assert num_requests == 2
+
+
 async def test_server_context_manager(app: web.Application) -> None:
     async with TestServer(app) as server:
         async with aiohttp.ClientSession() as client: