traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with 3.3 

Issue #14574: Ignore socket errors raised when flushing a connection on close.
This commit is contained in:
Kristján Valur Jónsson 2012-12-26 15:15:17 +00:00
parent ae57cec791 c8e7e2bb76
commit cacb400345
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/socketserver.rst
View File

@ -313,8 +313,8 @@ request.
.. method:: RequestHandler.finish() .. method:: RequestHandler.finish()
Called after the :meth:`handle` method to perform any clean-up actions Called after the :meth:`handle` method to perform any clean-up actions
required. The default implementation does nothing. If :meth:`setup` or required. The default implementation does nothing. If :meth:`setup`
:meth:`handle` raise an exception, this function will not be called. raises an exception, this function will not be called.
.. method:: RequestHandler.handle() .. method:: RequestHandler.handle()

7
Lib/socketserver.py
View File

@ -718,7 +718,12 @@ class StreamRequestHandler(BaseRequestHandler):
def finish(self): def finish(self):
if not self.wfile.closed: if not self.wfile.closed:
self.wfile.flush() try:
self.wfile.flush()
except socket.error:
# An final socket error may have occurred here, such as
# the local error ECONNABORTED.
pass
self.wfile.close() self.wfile.close()
self.rfile.close() self.rfile.close()