Don't start heartbeat until _writer is set (#4062) (#4323)

aio-libs · Oct 16, 2020 · aa3895a · aa3895a
1 parent 59d0f2e
commit aa3895a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES/4062.bugfix b/CHANGES/4062.bugfix
@@ -0,0 +1 @@
+Don't start heartbeat until _writer is set
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -93,6 +93,7 @@ Emil Melnikov
 Enrique Saez
 Eric Sheng
 Erich Healy
+Erik Peterson
 Eugene Chernyshov
 Eugene Naydenov
 Eugene Nikolaiev

diff --git a/aiohttp/web_ws.py b/aiohttp/web_ws.py
@@ -209,8 +209,6 @@ def _pre_start(self, request: BaseRequest) -> Tuple[str, WebSocketWriter]:
         headers, protocol, compress, notakeover = self._handshake(
             request)
 
-        self._reset_heartbeat()
-
         self.set_status(101)
         self.headers.update(headers)
         self.force_close()
@@ -228,6 +226,9 @@ def _post_start(self, request: BaseRequest,
                     protocol: str, writer: WebSocketWriter) -> None:
         self._ws_protocol = protocol
         self._writer = writer
+
+        self._reset_heartbeat()
+
         loop = self._loop
         assert loop is not None
         self._reader = FlowControlDataQueue(