merge 3.1

2011-05-24 12:51:24 -05:00 · 2011-05-24 12:51:24 -05:00 · e6a06217d2
parent 17658a1ca0 f847393308
commit e6a06217d2
1 changed files with 0 additions and 2 deletions
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@ -555,13 +555,11 @@ class ForkingMixIn:
            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)