summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-24 17:50:34 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-24 17:50:34 (GMT)
commitf8473933083cd045bdb0bf0dda8516e268846bd5 (patch)
treeaf6b9047f425f5059b735fda95eaf158fa9bc30d
parentfbe56bb8bdc40179e42ef14e59b2b24df902c52a (diff)
downloadcpython-f8473933083cd045bdb0bf0dda8516e268846bd5.zip
cpython-f8473933083cd045bdb0bf0dda8516e268846bd5.tar.gz
cpython-f8473933083cd045bdb0bf0dda8516e268846bd5.tar.bz2
backout 8b384de4e780, so a proper fix can be considered (#5715)
-rw-r--r--Lib/socketserver.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index c53ac29..e7faf88 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -534,12 +534,10 @@ class ForkingMixIn:
# This must never return, hence os._exit()!
try:
self.finish_request(request, client_address)
- self.socket.close()
os._exit(0)
except:
try:
self.handle_error(request, client_address)
- self.socket.close()
finally:
os._exit(1)