From: Victor Stinner <vstinner@redhat.com>
Date: Fri, 1 Jun 2018 12:07:50 +0000 (+0200)
Subject: bpo-33540: Fix socketserver.ThreadingMixIn if block_on_close=False (GH-7309)
X-Git-Tag: v3.7.0rc1~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29ae9dc7c30b23055fdd39bec4c8f19a28392351;p=python

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

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

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 71bb9a48fa..9dfd21bab9 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)