bpo-39797 Changes to socketserver.BaseServer's shutdown() method. (GH-18929)

Automerge-Triggered-By: @ned-deily

diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index 7c8c8d52e03d95461b425ba5e80af3cb73d78a4a..232c0616d925dc00a6632a847b024a1127e0c8f7 100644 (file)
--- 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()