aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tcp.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2015-06-12 15:21:23 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2015-06-12 15:27:29 +0200
commit5fab755a05f2ddd1b3e8e446e10fdcbded894e70 (patch)
tree92edfdfb567749bbdbc89bedeff8058f3953abc0 /netlib/tcp.py
parenta901bc3032747faf00adf82c3187d38213c070ca (diff)
downloadmitmproxy-5fab755a05f2ddd1b3e8e446e10fdcbded894e70.tar.gz
mitmproxy-5fab755a05f2ddd1b3e8e446e10fdcbded894e70.tar.bz2
mitmproxy-5fab755a05f2ddd1b3e8e446e10fdcbded894e70.zip
add more tests
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r--netlib/tcp.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py
index 98b17c50..eb8a523f 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -412,7 +412,7 @@ class _Connection(object):
def alpn_select_callback(conn, options):
if alpn_select in options:
return bytes(alpn_select)
- else:
+ else: # pragma no cover
return options[0]
context.set_alpn_select_callback(alpn_select_callback)
@@ -500,9 +500,9 @@ class TCPClient(_Connection):
return self.connection.gettimeout()
def get_alpn_proto_negotiated(self):
- if OpenSSL._util.lib.Cryptography_HAS_ALPN:
+ if OpenSSL._util.lib.Cryptography_HAS_ALPN and self.ssl_established:
return self.connection.get_alpn_proto_negotiated()
- else: # pragma no cover
+ else:
return None
@@ -616,7 +616,7 @@ class BaseHandler(_Connection):
def get_alpn_proto_negotiated(self):
if OpenSSL._util.lib.Cryptography_HAS_ALPN and self.ssl_established:
return self.connection.get_alpn_proto_negotiated()
- else: # pragma no cover
+ else:
return None