merging revision 73819 from trunk
This commit is contained in:
Kristján Valur Jónsson 2009-07-04 15:09:25 +00:00
parent 04cecafce1
commit 8c4f4178cb
3 changed files with 8 additions and 7 deletions

View file

@ -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()