Commit7cdc31a

authored

bpo-38907: Suppress any exception when attempting to set V6ONLY. (GH-17864)

Fixes error attempting to bind to IPv4 address.

1 parent5136e72 commit7cdc31aCopy full SHA for 7cdc31a

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@`
`103`	`103`	`importsys`
`104`	`104`	`importtime`
`105`	`105`	`importurllib.parse`
	`106`	`+importcontextlib`
`106`	`107`	`fromfunctoolsimportpartial`
`107`	`108`
`108`	`109`	`fromhttpimportHTTPStatus`
`@@ -1286,7 +1287,10 @@ def test(HandlerClass=BaseHTTPRequestHandler,`
`1286`	`1287`	`# ensure dual-stack is not disabled; ref #38907`
`1287`	`1288`	`classDualStackServer(ThreadingHTTPServer):`
`1288`	`1289`	`defserver_bind(self):`
`1289`		`-self.socket.setsockopt(socket.IPPROTO_IPV6,socket.IPV6_V6ONLY,0)`
	`1290`	`+# suppress exception when protocol is IPv4`
	`1291`	`+withcontextlib.suppress(Exception):`
	`1292`	`+self.socket.setsockopt(`
	`1293`	`+socket.IPPROTO_IPV6,socket.IPV6_V6ONLY,0)`
`1290`	`1294`	`returnsuper().server_bind()`
`1291`	`1295`
`1292`	`1296`	`test(`

Comments

(0)