From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Tue, 25 Dec 2012 22:46:32 +0000 (+0000)
Subject: Issue #14574: Ignore socket errors raised when flushing a connection on close.
X-Git-Tag: v3.3.1rc1~480^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36852b7844fd15fb80a9366ea861c2d5159bb51e;p=thirdparty%2FPython%2Fcpython.git

Issue #14574: Ignore socket errors raised when flushing a connection on close.
---

diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index 5287f17a28d9..4f223478e63d 100644
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -299,8 +299,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 adf9f38ead8f..8f80a7dc314f 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -700,7 +700,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()