diff options
| author | Yury Selivanov <yury@magic.io> | 2016-09-15 19:46:40 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yury@magic.io> | 2016-09-15 19:46:40 (GMT) |
| commit | 01683d86f241a591bfd18cb130a98323fc2d4055 (patch) | |
| tree | a0db7a5e1f84541d5ffc6db0bfc17b1822541959 | |
| parent | 965675e1e5809dfae0dad638f4af8d197d49178e (diff) | |
| parent | 1b984ffd44f036cf5c0ce1933c0fb9ba6e94948a (diff) | |
| download | cpython-01683d86f241a591bfd18cb130a98323fc2d4055.zip cpython-01683d86f241a591bfd18cb130a98323fc2d4055.tar.gz cpython-01683d86f241a591bfd18cb130a98323fc2d4055.tar.bz2 | |
Merge 3.6 (issue #28174)
| -rw-r--r-- | Lib/asyncio/base_events.py | 25 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_base_events.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 27 insertions, 12 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 53f5f02..ac6e8f2 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -76,6 +76,17 @@ def _format_pipe(fd): return repr(fd) +def _set_reuseport(sock): + if not hasattr(socket, 'SO_REUSEPORT'): + raise ValueError('reuse_port not supported by socket module') + else: + try: + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) + except OSError: + raise ValueError('reuse_port not supported by socket module, ' + 'SO_REUSEPORT defined but not implemented.') + + # Linux's sock.type is a bitmask that can include extra info about socket. _SOCKET_TYPE_MASK = 0 if hasattr(socket, 'SOCK_NONBLOCK'): @@ -874,12 +885,7 @@ class BaseEventLoop(events.AbstractEventLoop): sock.setsockopt( socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) if reuse_port: - if not hasattr(socket, 'SO_REUSEPORT'): - raise ValueError( - 'reuse_port not supported by socket module') - else: - sock.setsockopt( - socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) + _set_reuseport(sock) if allow_broadcast: sock.setsockopt( socket.SOL_SOCKET, socket.SO_BROADCAST, 1) @@ -1002,12 +1008,7 @@ class BaseEventLoop(events.AbstractEventLoop): sock.setsockopt( socket.SOL_SOCKET, socket.SO_REUSEADDR, True) if reuse_port: - if not hasattr(socket, 'SO_REUSEPORT'): - raise ValueError( - 'reuse_port not supported by socket module') - else: - sock.setsockopt( - socket.SOL_SOCKET, socket.SO_REUSEPORT, True) + _set_reuseport(sock) # Disable IPv4/IPv6 dual stack support (enabled by # default on Linux) which makes a single socket # listen on both address families. diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 0efdc20..43ebdc8 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1371,6 +1371,17 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self.assertRaises(ValueError, self.loop.run_until_complete, f) @patch_socket + def test_create_server_soreuseport_only_defined(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + m_socket.socket.return_value = mock.Mock() + m_socket.SO_REUSEPORT = -1 + + f = self.loop.create_server( + MyProto, '0.0.0.0', 0, reuse_port=True) + + self.assertRaises(ValueError, self.loop.run_until_complete, f) + + @patch_socket def test_create_server_cant_bind(self, m_socket): class Err(OSError): @@ -432,6 +432,9 @@ Library - Issue #27906: Fix socket accept exhaustion during high TCP traffic. Patch by Kevin Conway. +- Issue #28174: Handle when SO_REUSEPORT isn't properly supported. + Patch by Seth Michael Larson. + IDLE ---- |