From 29723368e797f36ba8940f25b6e677852b7313b2 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 20 Mar 2020 01:08:52 -0700
Subject: 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>
---
 Doc/library/socketserver.rst | 2 ++
 1 file changed, 2 insertions(+)

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()
-- 
cgit v0.12