From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 1 Jun 2018 12:21:34 +0000 (+0200)
Subject: bpo-33540: Fix socketserver.ThreadingMixIn if block_on_close=False (GH-7310)
X-Git-Tag: v3.8.0a1~1695
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829fcd0612049b21a6d3802b3306705218255f6b;p=thirdparty%2FPython%2Fcpython.git

bpo-33540: Fix socketserver.ThreadingMixIn if block_on_close=False (GH-7310)

socketserver.ThreadingMixIn no longer tracks active threads if
block_on_close is false.
---

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 71bb9a48fa91..9dfd21bab9b6 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -655,7 +655,7 @@ class ThreadingMixIn:
         t = threading.Thread(target = self.process_request_thread,
                              args = (request, client_address))
         t.daemon = self.daemon_threads
-        if not t.daemon:
+        if not t.daemon and self.block_on_close:
             if self._threads is None:
                 self._threads = []
             self._threads.append(t)