Backport: #8444 into 3.9

Please see #8445 for the source PR

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

@@ -46,6 +46,7 @@ Anes Abismail
 Antoine Pietri
 Anton Kasyanov
 Anton Zhdan-Pushkin
+Arcadiy Ivanov
 Arseny Timoniq
 Artem Yushkovskiy
 Arthur Darcet

aiohttp/client.py

@@ -922,6 +922,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(receive_timeout or timeout, conn_proto.read_timeout)
+                if conn_proto.read_timeout
+                else (receive_timeout or timeout)
+            )
             transport = conn.transport
             assert transport is not None
             reader: FlowControlDataQueue[WSMessage] = FlowControlDataQueue(

aiohttp/client_proto.py

@@ -224,6 +224,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 = ServerTimeoutError("Timeout on reading data from socket")
         self.set_exception(exc)