From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Sat, 4 Jul 2009 15:18:00 +0000 (+0000)
Subject: http://bugs.python.org/issue6381
X-Git-Tag: v3.2a1~2883
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=200cfd00abd31d40d3f9c4d61ec06b63f3f66170;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index e5f5778872fe..37df2bab33c7 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -445,7 +445,12 @@ class TCPServer(BaseServer):
 
     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()