[Python-checkins] cpython (3.1): backout 8b384de4e780, so a proper fix can be considered (#5715)

benjamin.peterson python-checkins at python.org
Tue May 24 19:51:24 CEST 2011


http://hg.python.org/cpython/rev/3e1709213532
changeset:   70343:3e1709213532
branch:      3.1
parent:      70338:310b484ebd91
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue May 24 12:50:34 2011 -0500
summary:
  backout 8b384de4e780, so a proper fix can be considered (#5715)

files:
  Lib/socketserver.py |  2 --
  1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/Lib/socketserver.py b/Lib/socketserver.py
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -534,12 +534,10 @@
             # 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)
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list