From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 May 2011 17:09:26 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1rc2~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48e21fc46f3348c987d671ac4068a03c169ea801;p=thirdparty%2FPython%2Fcpython.git

merge 3.1
---

48e21fc46f3348c987d671ac4068a03c169ea801
diff --cc Lib/socketserver.py
index f42802c27a90,c53ac2971f00..1103f4bfe81e
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@@ -552,15 -532,14 +552,16 @@@ class ForkingMixIn
          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)