Commit 9b325b0a authored by Benjamin Peterson's avatar Benjamin Peterson

merge 3.2

parents 247b52bd 48e21fc4
......@@ -552,15 +552,16 @@ class ForkingMixIn:
else:
# Child process.
# This must never return, hence os._exit()!
self.socket.close()
try:
self.finish_request(request, client_address)
self.shutdown_request(request)
self.socket.close()
os._exit(0)
except:
try:
self.handle_error(request, client_address)
self.shutdown_request(request)
self.socket.close()
finally:
os._exit(1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment