summaryrefslogtreecommitdiff
path: root/Lib/socketserver.py
diff options
context:
space:
mode:
authorKristján Valur Jónsson <kristjan@ccpgames.com>2012-12-25 22:46:32 +0000
committerKristján Valur Jónsson <kristjan@ccpgames.com>2012-12-25 22:46:32 +0000
commit36852b7844fd15fb80a9366ea861c2d5159bb51e (patch)
treeeb6889003a2df91bdb2d2320cf5f1caaaa32cc5d /Lib/socketserver.py
parent303eb478f27720f0e5b6b4147b05f9c15f7fd8f6 (diff)
downloadcpython-git-36852b7844fd15fb80a9366ea861c2d5159bb51e.tar.gz
Issue #14574: Ignore socket errors raised when flushing a connection on close.
Diffstat (limited to 'Lib/socketserver.py')
-rw-r--r--Lib/socketserver.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index adf9f38ead..8f80a7dc31 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()