mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-05 06:31:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-30319: socket.close() now ignores ECONNRESET (#2565) (#2566)

Browse source 
socket.close() was modified in Python 3.6 to raise OSError on
failure: see bpo-26685.
(cherry picked from commit 67e1478dba)
This commit is contained in:
Victor Stinner 2017-07-04 16:46:10 +02:00 • committed by GitHub
parent 23e2c3d193
commit 580cd5cd36
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2017-07-04-13-48-21.bpo-30319.hg_3TX.rst Normal file
View file

@ -0,0 +1 @@
socket.close() now ignores ECONNRESET error.

4
Modules/socketmodule.c
View file

@ -2704,7 +2704,9 @@ sock_close(PySocketSockObject *s)
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
res = SOCKETCLOSE(fd); res = SOCKETCLOSE(fd);
Py_END_ALLOW_THREADS 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(); return s->errorhandler();
} }
} }