diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-07-04 14:20:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 14:20:06 (GMT) |
| commit | 67e1478dba6efe60b8e1890192014b8b06dd6bd9 (patch) | |
| tree | d40e51acd43996f22a3dbbe31e9aa71036d342c1 | |
| parent | 378ebb6578b9d709f38b888d23874c0b18125249 (diff) | |
| download | cpython-67e1478dba6efe60b8e1890192014b8b06dd6bd9.zip cpython-67e1478dba6efe60b8e1890192014b8b06dd6bd9.tar.gz cpython-67e1478dba6efe60b8e1890192014b8b06dd6bd9.tar.bz2 | |
bpo-30319: socket.close() now ignores ECONNRESET (#2565)
socket.close() was modified in Python 3.6 to raise OSError on
failure: see bpo-26685.
| -rw-r--r-- | Misc/NEWS.d/next/Library/2017-07-04-13-48-21.bpo-30319.hg_3TX.rst | 1 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Library/2017-07-04-13-48-21.bpo-30319.hg_3TX.rst b/Misc/NEWS.d/next/Library/2017-07-04-13-48-21.bpo-30319.hg_3TX.rst new file mode 100644 index 0000000..1112d2f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-07-04-13-48-21.bpo-30319.hg_3TX.rst @@ -0,0 +1 @@ +socket.close() now ignores ECONNRESET error. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index a1d829f..e18dd32 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -2696,7 +2696,9 @@ sock_close(PySocketSockObject *s) Py_BEGIN_ALLOW_THREADS res = SOCKETCLOSE(fd); Py_END_ALLOW_THREADS - if (res < 0) { + /* bpo-30319: The peer can already have closed the connection. + Python ignores ECONNRESET on close(). */ + if (res < 0 && errno != ECONNRESET) { return s->errorhandler(); } } |