merge 3.2

4f4c8975 · Benjamin Peterson · 601b096c · 68203e7b · 4f4c8975
Commit 4f4c8975 authored May 24, 2011 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

Lib/socketserver.py Lib/socketserver.py +0 -2

No files found.
--- 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)