summaryrefslogtreecommitdiffstats
path: root/Lib/socketserver.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-11-04 09:22:57 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-11-04 09:22:57 (GMT)
commit495dcbd5c13007dfd679edc8067131228c65bccb (patch)
treee35235d872f0727a1d56311b5e212c7615b022e2 /Lib/socketserver.py
parent3d7acb08c43f0319b200c967b009e926daa97222 (diff)
parent12b66b5217d7cbccbeb918683f6df8ab9ae84c3d (diff)
downloadcpython-495dcbd5c13007dfd679edc8067131228c65bccb.zip
cpython-495dcbd5c13007dfd679edc8067131228c65bccb.tar.gz
cpython-495dcbd5c13007dfd679edc8067131228c65bccb.tar.bz2
Merge 3.2: issue #13140
Diffstat (limited to 'Lib/socketserver.py')
-rw-r--r--Lib/socketserver.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 0d217ed..a487e63 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -606,8 +606,7 @@ class ThreadingMixIn:
"""Start a new thread to process the request."""
t = threading.Thread(target = self.process_request_thread,
args = (request, client_address))
- if self.daemon_threads:
- t.daemon = True
+ t.daemon = self.daemon_threads
t.start()