python · vstinner · Jul 4, 2017 · Jul 4, 2017
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
@@ -0,0 +1 @@
+socket.close() now ignores ECONNRESET error.
diff --git 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();
        }
    }