summaryrefslogtreecommitdiffstats
path: root/Lib/socketserver.py
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-06-01 12:21:34 (GMT)
committerGitHub <noreply@github.com>2018-06-01 12:21:34 (GMT)
commit829fcd0612049b21a6d3802b3306705218255f6b (patch)
tree1ad3d1c2918cf6c04d8c5dd55703bd2df9d0b049 /Lib/socketserver.py
parente905c84494526363086f66a979e317e155bf9536 (diff)
downloadcpython-829fcd0612049b21a6d3802b3306705218255f6b.zip
cpython-829fcd0612049b21a6d3802b3306705218255f6b.tar.gz
cpython-829fcd0612049b21a6d3802b3306705218255f6b.tar.bz2
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.
Diffstat (limited to 'Lib/socketserver.py')
-rw-r--r--Lib/socketserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 71bb9a4..9dfd21b 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)