diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-02-22 22:58:52 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-02-24 13:39:03 +0100 |
| commit | fab3a8dcf4d7cdce55099172e45a6a0978eac4ab (patch) | |
| tree | 9222f639c50e252339378e8c881474274adc8ae4 | |
| parent | 3e9125a3c13084f4abb0e5b74554909f24df9454 (diff) | |
| download | mitmproxy-fab3a8dcf4d7cdce55099172e45a6a0978eac4ab.tar.gz mitmproxy-fab3a8dcf4d7cdce55099172e45a6a0978eac4ab.tar.bz2 mitmproxy-fab3a8dcf4d7cdce55099172e45a6a0978eac4ab.zip | |
fix constant definition
| -rw-r--r-- | mitmproxy/net/tcp.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mitmproxy/net/tcp.py b/mitmproxy/net/tcp.py index 605a11a7..dc5e2ee2 100644 --- a/mitmproxy/net/tcp.py +++ b/mitmproxy/net/tcp.py @@ -30,8 +30,7 @@ socket_fileobject = socket.SocketIO # workaround for https://bugs.python.org/issue29515 # Python 3.5 and 3.6 for Windows is missing a constant -if not hasattr(socket, 'IPV6_V6ONLY'): - socket.IPV6_V6ONLY = 41 +IPPROTO_IPV6 = getattr(socket, "IPPROTO_IPV6", 41) EINTR = 4 HAS_ALPN = SSL._lib.Cryptography_HAS_ALPN @@ -866,9 +865,9 @@ class TCPServer: # Only works if self.address == "" self.socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0) + self.socket.setsockopt(IPPROTO_IPV6, socket.IPV6_V6ONLY, 0) self.socket.bind(self.address) - except: + except socket.error: self.socket = None if not self.socket: |