diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-03-20 08:08:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 08:08:52 (GMT) |
| commit | 29723368e797f36ba8940f25b6e677852b7313b2 (patch) | |
| tree | 5e6c9d915cb34e8730374db71ccd14ac20771851 /Doc | |
| parent | 2477aed12d409c78a16ec435e01cee235af53221 (diff) | |
| download | cpython-29723368e797f36ba8940f25b6e677852b7313b2.zip cpython-29723368e797f36ba8940f25b6e677852b7313b2.tar.gz cpython-29723368e797f36ba8940f25b6e677852b7313b2.tar.bz2 | |
bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (GH-18929)
Automerge-Triggered-By: @ned-deily
(cherry picked from commit 2de7ac97981c30e9c1001b05a771f52a41772c54)
Co-authored-by: amaajemyfren <32741226+amaajemyfren@users.noreply.github.com>
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/socketserver.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 7c8c8d5..232c061 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -237,6 +237,8 @@ Server Objects .. method:: shutdown() Tell the :meth:`serve_forever` loop to stop and wait until it does. + :meth:`shutdown` must be called while :meth:`serve_forever` is running in a + different thread otherwise it will deadlock. .. method:: server_close() |