[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1

[benjamin.peterson]

http://hg.python.org/cpython/rev/5943621ba121
changeset:   70336:5943621ba121
branch:      3.2
parent:      70333:ccd59ba8145e
parent:      70335:8b384de4e780
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue May 24 12:09:26 2011 -0500
summary:
  merge 3.1

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


diff --git a/Lib/socketserver.py b/Lib/socketserver.py
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -552,15 +552,16 @@
         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)
 

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