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

vstinner · web-flow · commit 67e1478dba6e · 2017-07-04T16:20:06.000+02:00
socket.close() was modified in Python 3.6 to raise OSError on failure: see bpo-26685.
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();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+socket.close() now ignores ECONNRESET error.`
Original file line number	Diff line number	Diff line change
`@@ -2696,7 +2696,9 @@ sock_close(PySocketSockObject *s)`
`2696`	`2696`	`Py_BEGIN_ALLOW_THREADS`
`2697`	`2697`	`res = SOCKETCLOSE(fd);`
`2698`	`2698`	`Py_END_ALLOW_THREADS`
`2699`		`- if (res < 0) {`
	`2699`	`+ /* bpo-30319: The peer can already have closed the connection.`
	`2700`	`+ Python ignores ECONNRESET on close(). */`
	`2701`	`+ if (res < 0 && errno != ECONNRESET) {`
`2700`	`2702`	`return s->errorhandler();`
`2701`	`2703`	`}`
`2702`	`2704`	`}`