Fixes socket timeout on WS connection not respecting ws_connect's tim…

…eouts

Added read_timeout property to ResponseHandler to allow override

After WS(S) connection is established, adjust `conn.proto.read_timeout` to
be the largest of the `read_timeout` and the `ws_connect`'s
`timeout` or `receive_timeout`, whichever are specified.

fixes #8444

CHANGES/8444.bugfix

@@ -0,0 +1,2 @@
+Fix ``ws_connect`` not respecting ``timeout`` nor ``receive_timeout`` on WS(S) connection.
+-- by :user:`arcivanov`.

CONTRIBUTORS.txt

@@ -47,6 +47,7 @@ Anes Abismail
 Antoine Pietri
 Anton Kasyanov
 Anton Zhdan-Pushkin
+Arcadiy Ivanov
 Arie Bovenberg
 Arseny Timoniq
 Artem Yushkovskiy

aiohttp/client.py

@@ -939,6 +939,13 @@ async def _ws_connect(
             assert conn is not None
             conn_proto = conn.protocol
             assert conn_proto is not None
+            # For WS connection the sock_read must be either receive_timeout
+            # or timeout (whichever is specified), unless read_timeout is greater
+            conn_proto.read_timeout = (
+                max(ws_timeout.ws_receive, conn_proto.read_timeout)
+                if conn_proto.read_timeout
+                else ws_timeout.ws_receive
+            )
             transport = conn.transport
             assert transport is not None
             reader: FlowControlDataQueue[WSMessage] = FlowControlDataQueue(

aiohttp/client_proto.py

@@ -240,6 +240,14 @@ def _reschedule_timeout(self) -> None:
     def start_timeout(self) -> None:
         self._reschedule_timeout()
 
+    @property
+    def read_timeout(self) -> Optional[float]:
+        return self._read_timeout
+
+    @read_timeout.setter
+    def read_timeout(self, read_timeout: Optional[float]) -> None:
+        self._read_timeout = read_timeout
+
     def _on_read_timeout(self) -> None:
         exc = SocketTimeoutError("Timeout on reading data from socket")
         self.set_exception(exc)