Commit 613478e6 authored by Gregory P. Smith's avatar Gregory P. Smith

Fix test.support.bind_port() to not cause an error when Python was compiled

on a system with SO_REUSEPORT defined in the headers but run on a system
with an OS kernel that does not support that reasonably new socket option.
parent 354c5851
...@@ -570,9 +570,15 @@ def bind_port(sock, host=HOST): ...@@ -570,9 +570,15 @@ def bind_port(sock, host=HOST):
raise TestFailed("tests should never set the SO_REUSEADDR " \ raise TestFailed("tests should never set the SO_REUSEADDR " \
"socket option on TCP/IP sockets!") "socket option on TCP/IP sockets!")
if hasattr(socket, 'SO_REUSEPORT'): if hasattr(socket, 'SO_REUSEPORT'):
if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1: try:
raise TestFailed("tests should never set the SO_REUSEPORT " \ if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1:
"socket option on TCP/IP sockets!") raise TestFailed("tests should never set the SO_REUSEPORT " \
"socket option on TCP/IP sockets!")
except OSError:
# Python's socket module was compiled using modern headers
# thus defining SO_REUSEPORT but this process is running
# under an older kernel that does not support SO_REUSEPORT.
pass
if hasattr(socket, 'SO_EXCLUSIVEADDRUSE'): if hasattr(socket, 'SO_EXCLUSIVEADDRUSE'):
sock.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1) sock.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1)
......
...@@ -13,6 +13,10 @@ Core and Builtins ...@@ -13,6 +13,10 @@ Core and Builtins
Library Library
------- -------
- Fix test.support.bind_port() to not cause an error when Python was compiled
on a system with SO_REUSEPORT defined in the headers but run on a system
with an OS kernel that does not support that reasonably new socket option.
- Fix compilation error under gcc of the ctypes module bundled libffi for arm. - Fix compilation error under gcc of the ctypes module bundled libffi for arm.
- Issue #19523: Closed FileHandler leak which occurred when delay was set. - Issue #19523: Closed FileHandler leak which occurred when delay was set.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment