From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 May 2011 17:51:24 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1rc2~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6a06217d2adedbe4a07ad007eb8c9e6c4150052;p=python

merge 3.1
---

e6a06217d2adedbe4a07ad007eb8c9e6c4150052
diff --cc Lib/socketserver.py
index 1103f4bfe8,e7faf884ef..73896081d1
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@@ -554,14 -534,10 +554,12 @@@ class ForkingMixIn
              # This must never return, hence os._exit()!
              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)