summaryrefslogtreecommitdiff
path: root/Doc/library
diff options
context:
space:
mode:
authoramaajemyfren <32741226+amaajemyfren@users.noreply.github.com>2020-03-20 11:03:18 +0300
committerGitHub <noreply@github.com>2020-03-20 01:03:18 -0700
commit2de7ac97981c30e9c1001b05a771f52a41772c54 (patch)
tree2a5a95132b3d27027172ba309a496365b3d7d61e /Doc/library
parent7bf069b6110278102c8f4719975a5eb5a5af25f9 (diff)
downloadcpython-git-2de7ac97981c30e9c1001b05a771f52a41772c54.tar.gz
bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (GH-18929)
Automerge-Triggered-By: @ned-deily
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/socketserver.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index 7c8c8d52e0..232c0616d9 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()