cpython: 7e5d7ef4634d (original) (raw)

Mercurial > cpython

changeset 81066:7e5d7ef4634d 3.2

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

Kristján Valur Jónsson kristjan@ccpgames.com
date	Tue, 25 Dec 2012 22:46:32 +0000
parents	0eccfb237364
children	7734c3020a47 3801ee5d5d73
files	Doc/library/socketserver.rst Lib/socketserver.py
diffstat	2 files changed, 8 insertions(+), 3 deletions(-)[+] [-] Doc/library/socketserver.rst 4 Lib/socketserver.py 7

line wrap: on

line diff

--- 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()

--- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -700,7 +700,12 @@ class StreamRequestHandler(BaseRequestHa def finish(self): if not self.wfile.closed:

```
       self.wfile.flush()[](#l2.7)
```

```
       try:[](#l2.8)
```
```
           self.wfile.flush()[](#l2.9)
```
```
       except socket.error:[](#l2.10)
```

           # An final socket error may have occurred here, such as[](#l2.11)

           # the local error ECONNABORTED.[](#l2.12)

           pass[](#l2.13)
   self.wfile.close()[](#l2.14)
   self.rfile.close()[](#l2.15)