diff options
| -rw-r--r-- | Doc/library/socketserver.rst | 4 | ||||
| -rw-r--r-- | Lib/socketserver.py | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 28e8a0aff7..e7f668cf07 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -313,8 +313,8 @@ request. .. method:: RequestHandler.finish() Called after the :meth:`handle` method to perform any clean-up actions - required. The default implementation does nothing. If :meth:`setup` or - :meth:`handle` raise an exception, this function will not be called. + required. The default implementation does nothing. If :meth:`setup` + raises an exception, this function will not be called. .. method:: RequestHandler.handle() diff --git a/Lib/socketserver.py b/Lib/socketserver.py index a21318d923..8332fdf66d 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -718,7 +718,12 @@ class StreamRequestHandler(BaseRequestHandler): def finish(self): 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.rfile.close() |