commit e6a06217d2adedbe4a07ad007eb8c9e6c4150052
author Benjamin Peterson <benjamin@python.org> Tue May 24 12:51:24 2011 -0500
committer Benjamin Peterson <benjamin@python.org> Tue May 24 12:51:24 2011 -0500
tree 78dd657337e7ec91f3557c6facf36a05b316bac5
parent 17658a1ca0af87f43ca880b03c4368a81f3ad51a
parent f8473933083cd045bdb0bf0dda8516e268846bd5

merge 3.1

Lib/socketserver.py

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 1103f4b..7389608 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -555,13 +555,11 @@
             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)