Commit580cd5c

authored

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

socket.close() was modified in Python 3.6 to raise OSError onfailure: seebpo-26685.(cherry picked from commit67e1478)

1 parent23e2c3d commit580cd5cCopy full SHA for 580cd5c

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+socket.close() now ignores ECONNRESET error.`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2704,7 +2704,9 @@ sock_close(PySocketSockObject *s)`
`2704`	`2704`	`Py_BEGIN_ALLOW_THREADS`
`2705`	`2705`	`res=SOCKETCLOSE(fd);`
`2706`	`2706`	`Py_END_ALLOW_THREADS`
`2707`		`-if (res<0) {`
	`2707`	`+/* bpo-30319: The peer can already have closed the connection.`
	`2708`	`+ Python ignores ECONNRESET on close(). */`
	`2709`	`+if (res<0&&errno!=ECONNRESET) {`
`2708`	`2710`	`returns->errorhandler();`
`2709`	`2711`	`}`
`2710`	`2712`	`}`

Comments

(0)