From e632824b3e67debe08b36c36ee97acc61e9b2f55 Mon Sep 17 00:00:00 2001
From: amaajemyfren <32741226+amaajemyfren@users.noreply.github.com>
Date: Wed, 11 Mar 2020 19:05:18 +0300
Subject: [PATCH 1/3] bpo-39797 Changes to shutdown() method.

---
 Doc/library/socketserver.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index 7c8c8d52e03d95..232c0616d925dc 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()

From 1cc02ce6e9f57917d010637fef9fc2f61a09b296 Mon Sep 17 00:00:00 2001
From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com>
Date: Wed, 11 Mar 2020 16:11:00 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?=
 =?UTF-8?q?rb=5Fit.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst  | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Misc/NEWS.d/next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst

diff --git a/Misc/NEWS.d/next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst b/Misc/NEWS.d/next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst
new file mode 100644
index 00000000000000..1bf309dd0579ab
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst
@@ -0,0 +1 @@
+Simple change to documentation for socketserver.BaseServer informing users that shutdown() should be run from a different thread than serve_forever()
\ No newline at end of file

From 56dd8811b58ae7ecb0707d0f2de247bd9462d6c2 Mon Sep 17 00:00:00 2001
From: amaajemyfren <32741226+amaajemyfren@users.noreply.github.com>
Date: Fri, 20 Mar 2020 00:50:26 +0300
Subject: [PATCH 3/3] Delete 2020-03-11-16-10-59.bpo-39797.PLnbnB.rst

News is not needed for documentation PRs
---
 .../next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst  | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 Misc/NEWS.d/next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst

diff --git a/Misc/NEWS.d/next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst b/Misc/NEWS.d/next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst
deleted file mode 100644
index 1bf309dd0579ab..00000000000000
--- a/Misc/NEWS.d/next/Documentation/2020-03-11-16-10-59.bpo-39797.PLnbnB.rst
+++ /dev/null
@@ -1 +0,0 @@
-Simple change to documentation for socketserver.BaseServer informing users that shutdown() should be run from a different thread than serve_forever()
\ No newline at end of file