Commit2a2247c

authored

bpo-32622: Normalize ENOTCONN to ConnectionError on macOS (GH-5369)

On mac, sendfile throws ENOTCONN on a repeated sendfile call ifthe connection is closed. Normalize it to behave like other systems.

1 parent47c0b1f commit2a2247cCopy full SHA for 2a2247c

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,17 @@ def _sock_sendfile_native_impl(self, fut, registered_fd, sock, fileno,`
`362`	`362`	`fd,sock,fileno,`
`363`	`363`	`offset,count,blocksize,total_sent)`
`364`	`364`	`exceptOSErrorasexc:`
	`365`	`+if (registered_fdisnotNoneand`
	`366`	`+exc.errno==errno.ENOTCONNand`
	`367`	`+type(exc)isnotConnectionError):`
	`368`	`+# If we have an ENOTCONN and this isn't a first call to`
	`369`	`+# sendfile(), i.e. the connection was closed in the middle`
	`370`	`+# of the operation, normalize the error to ConnectionError`
	`371`	`+# to make it consistent across all Posix systems.`
	`372`	`+new_exc=ConnectionError(`
	`373`	`+"socket is not connected",errno.ENOTCONN)`
	`374`	`+new_exc.__cause__=exc`
	`375`	`+exc=new_exc`
`365`	`376`	`iftotal_sent==0:`
`366`	`377`	`# We can get here for different reasons, the main`
`367`	`378`	`# one being 'file' is not a regular mmap(2)-like`

Comments

(0)