mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.1

Browse source
This commit is contained in:
Benjamin Peterson 2011-05-24 12:09:26 -05:00
commit 48e21fc46f
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/socketserver.py
View file

@ -552,15 +552,16 @@ class ForkingMixIn:
else: else:
# Child process. # Child process.
# This must never return, hence os._exit()! # This must never return, hence os._exit()!
self.socket.close()
try: try:
self.finish_request(request, client_address) self.finish_request(request, client_address)
self.shutdown_request(request) self.shutdown_request(request)
self.socket.close()
os._exit(0) os._exit(0)
except: except:
try: try:
self.handle_error(request, client_address) self.handle_error(request, client_address)
self.shutdown_request(request) self.shutdown_request(request)
self.socket.close()
finally: finally:
os._exit(1) os._exit(1)