merge 3.1

diff --cc Lib/socketserver.py
index 1103f4bfe81e4726b810ca85756694e2424041f8,e7faf884ef72f1fff003c10f196860e173af3590..73896081d1c6f093de5f83070821a2b9813a8fbd
--- 1/Lib/socketserver.py
--- 2/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.socket.close()
 +                self.shutdown_request(request)
                  os._exit(0)
              except:
                  try:
                      self.handle_error(request, client_address)
-                     self.socket.close()
 +                    self.shutdown_request(request)
                  finally:
                      os._exit(1)