From c5cb3d81f65e5b98d17ce571f9bd18ef49cc50b2da24469a31c595761a823abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 20 Sep 2023 16:04:07 +0000 Subject: [PATCH] Accepting request 1112595 from home:mcalabkova:branches:devel:languages:python:312 - Add py312-shutdown.patch to fix server shutdown on Python 3.12 OBS-URL: https://build.opensuse.org/request/show/1112595 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websockets?expand=0&rev=47 --- py312-shutdown.patch | 49 +++++++++++++++++++++++++++++++++++++++ python-websockets.changes | 5 ++++ python-websockets.spec | 2 ++ 3 files changed, 56 insertions(+) create mode 100644 py312-shutdown.patch diff --git a/py312-shutdown.patch b/py312-shutdown.patch new file mode 100644 index 0000000..6eb25e5 --- /dev/null +++ b/py312-shutdown.patch @@ -0,0 +1,49 @@ +From 03d62c97fcafffa5cdbe4bb55b2a8d17a62eca33 Mon Sep 17 00:00:00 2001 +From: Aymeric Augustin +Date: Thu, 18 May 2023 16:52:39 +0200 +Subject: [PATCH] Fix server shutdown on Python 3.12. + +Ref https://github.com/python/cpython/issues/79033. + +Fix #1356. +--- + src/websockets/legacy/server.py | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +Index: websockets-11.0.3/src/websockets/legacy/server.py +=================================================================== +--- websockets-11.0.3.orig/src/websockets/legacy/server.py ++++ websockets-11.0.3/src/websockets/legacy/server.py +@@ -765,18 +765,13 @@ class WebSocketServer: + # Stop accepting new connections. + self.server.close() + +- # Wait until self.server.close() completes. +- await self.server.wait_closed() +- + # Wait until all accepted connections reach connection_made() and call + # register(). See https://bugs.python.org/issue34852 for details. + await asyncio.sleep(0, **loop_if_py_lt_38(self.get_loop())) + + if close_connections: +- # Close OPEN connections with status code 1001. Since the server was +- # closed, handshake() closes OPENING connections with an HTTP 503 +- # error. Wait until all connections are closed. +- ++ # Close OPEN connections with close code 1001. After server.close(), ++ # handshake() closes OPENING connections with an HTTP 503 error. + close_tasks = [ + asyncio.create_task(websocket.close(1001)) + for websocket in self.websockets +@@ -789,8 +784,10 @@ class WebSocketServer: + **loop_if_py_lt_38(self.get_loop()), + ) + +- # Wait until all connection handlers are complete. ++ # Wait until all TCP connections are closed. ++ await self.server.wait_closed() + ++ # Wait until all connection handlers terminate. + # asyncio.wait doesn't accept an empty first argument. + if self.websockets: + await asyncio.wait( diff --git a/python-websockets.changes b/python-websockets.changes index ff04c61..ddea643 100644 --- a/python-websockets.changes +++ b/python-websockets.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 20 14:58:11 UTC 2023 - Markéta Machová + +- Add py312-shutdown.patch to fix server shutdown on Python 3.12 + ------------------------------------------------------------------- Wed May 24 11:10:45 UTC 2023 - Daniel Garcia diff --git a/python-websockets.spec b/python-websockets.spec index 2261c3b..f634909 100644 --- a/python-websockets.spec +++ b/python-websockets.spec @@ -25,6 +25,8 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/aaugustin/websockets Source: https://github.com/aaugustin/websockets/archive/%{version}.tar.gz +# PATCH-FIX-UPSTREAM https://github.com/python-websockets/websockets/commit/03d62c97fcafffa5cdbe4bb55b2a8d17a62eca33 Fix server shutdown on Python 3.12. +Patch: py312-shutdown.patch BuildRequires: %{python_module devel >= 3.7} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools}