#15277: Fix a resource leak in support.py when IPv6 is disabled.
The leak occurred by setting: echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6 before running test_support. Patch by Brian Brazil.
This commit is contained in:
parent
9a9c28ce7a
commit
121d59ffa9
|
@ -493,14 +493,16 @@ def bind_port(sock, host=HOST):
|
|||
def _is_ipv6_enabled():
|
||||
"""Check whether IPv6 is enabled on this host."""
|
||||
if socket.has_ipv6:
|
||||
sock = None
|
||||
try:
|
||||
sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
|
||||
sock.bind(('::1', 0))
|
||||
return True
|
||||
except (socket.error, socket.gaierror):
|
||||
pass
|
||||
else:
|
||||
sock.close()
|
||||
return True
|
||||
finally:
|
||||
if sock:
|
||||
sock.close()
|
||||
return False
|
||||
|
||||
IPV6_ENABLED = _is_ipv6_enabled()
|
||||
|
|
Loading…
Reference in New Issue