From 5e716e2b91fd1c2eada4b9c85cc6c44f18ed1074 Mon Sep 17 00:00:00 2001 From: SVN-Git Migration Date: Thu, 8 Oct 2015 13:13:33 -0700 Subject: Ignore ENOPROTOOPT errors from SO_REUSEADDR or SO_ERROR on AF_UNIX sockets, for systems which do not implement them there. Patch-Name: sockopt.patch --- tornado/iostream.py | 7 ++++++- tornado/netutil.py | 12 ++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tornado/iostream.py b/tornado/iostream.py index bcf4441..b5f49fa 100644 --- a/tornado/iostream.py +++ b/tornado/iostream.py @@ -1174,7 +1174,12 @@ class IOStream(BaseIOStream): return future def _handle_connect(self): - err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR) + try: + err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR) + except socket.error as e: + err = e.args[0] + if err == errno.ENOPROTOOPT: + err = 0 if err != 0: self.error = socket.error(err, os.strerror(err)) # IOLoop implementations may vary: some of them return diff --git a/tornado/netutil.py b/tornado/netutil.py index 7bf9321..130966c 100644 --- a/tornado/netutil.py +++ b/tornado/netutil.py @@ -169,9 +169,17 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC, raise set_close_exec(sock.fileno()) if os.name != 'nt': - sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + try: + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + except socket.error as e: + if e.args[0] != errno.ENOPROTOOPT: + raise if reuse_port: - sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) + try: + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) + except socket.error as e: + if e.args[0] != errno.ENOPROTOOPT: + raise if af == socket.AF_INET6: # On linux, ipv6 sockets accept ipv4 too by default, # but this makes it impossible to bind to both