commit 67e1478dba6efe60b8e1890192014b8b06dd6bd9
author Victor Stinner <victor.stinner@gmail.com> Tue Jul 04 16:20:06 2017 +0200
committer GitHub <noreply@github.com> Tue Jul 04 16:20:06 2017 +0200
tree d40e51acd43996f22a3dbbe31e9aa71036d342c1
parent 378ebb6578b9d709f38b888d23874c0b18125249

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

socket.close() was modified in Python 3.6 to raise OSError on
failure: see bpo-26685.

Modules/socketmodule.c

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 @@
         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();
         }
     }