commit 200cfd00abd31d40d3f9c4d61ec06b63f3f66170
author Kristján Valur Jónsson <kristjan@ccpgames.com> Sat Jul 04 15:18:00 2009 +0000
committer Kristján Valur Jónsson <kristjan@ccpgames.com> Sat Jul 04 15:18:00 2009 +0000
tree b2f37a020a1daabeebb3130d705d3b007624d3ab
parent b8e138aa238e23e9b3e53e012cd4e0b54ec28022

http://bugs.python.org/issue6381
merging revision 73819 from trunk

Lib/socketserver.py

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index e5f5778..37df2ba 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -445,7 +445,12 @@
 
     def close_request(self, request):
         """Called to clean up an individual request."""
-        request.shutdown(socket.SHUT_WR)
+        try:
+            #explicitly shutdown.  socket.close() merely releases
+            #the socket and waits for GC to perform the actual close.
+            request.shutdown(socket.SHUT_WR)
+        except socket.error:
+            pass #some platforms may raise ENOTCONN here
         request.close()