diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:40:42 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:40:42 -0600 |
| commit | 1f7df8f2070391f28391e3594580c07e11b6b32b (patch) | |
| tree | ec03dfe4f71df3840232731145b8f6736fc6a314 /Lib/SocketServer.py | |
| parent | b25d611f8d9140e83acbfffb6b0579939c88c033 (diff) | |
| parent | 10e93a6d40502e100c68090730e0b3190df97854 (diff) | |
| download | cpython-git-1f7df8f2070391f28391e3594580c07e11b6b32b.tar.gz | |
merge heads
Diffstat (limited to 'Lib/SocketServer.py')
| -rw-r--r-- | Lib/SocketServer.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py index 1594321909..26611b74d1 100644 --- a/Lib/SocketServer.py +++ b/Lib/SocketServer.py @@ -701,7 +701,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() |