]> granicus.if.org Git - python/commitdiff
bpo-33540: Fix socketserver.ThreadingMixIn if block_on_close=False (GH-7309)
authorVictor Stinner <vstinner@redhat.com>
Fri, 1 Jun 2018 12:07:50 +0000 (14:07 +0200)
committerGitHub <noreply@github.com>
Fri, 1 Jun 2018 12:07:50 +0000 (14:07 +0200)
socketserver.ThreadingMixIn no longer tracks active threads if
block_on_close is false.

Lib/socketserver.py

index 71bb9a48fa918aff6ef31e45f9b51442c7895f65..9dfd21bab9b6f9f25410ef0b3fa1e6c11bcec303 100644 (file)
@@ -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)