diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-17 19:20:28 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-17 19:20:28 +0200 |
| commit | 99129ab5a15bc4708eda80e4f56b46bb0f1efa86 (patch) | |
| tree | 661d6eaac3cdc47d2f436df9e8defb73e7a75880 /libmproxy/protocol2/tls.py | |
| parent | a2b85048892626e6834df06e9022498814724636 (diff) | |
| parent | 38c456bb627c4570e0ed983229ec8ef2f120a4b6 (diff) | |
| download | mitmproxy-99129ab5a15bc4708eda80e4f56b46bb0f1efa86.tar.gz mitmproxy-99129ab5a15bc4708eda80e4f56b46bb0f1efa86.tar.bz2 mitmproxy-99129ab5a15bc4708eda80e4f56b46bb0f1efa86.zip | |
Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
Conflicts:
libmproxy/protocol2/http.py
Diffstat (limited to 'libmproxy/protocol2/tls.py')
| -rw-r--r-- | libmproxy/protocol2/tls.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmproxy/protocol2/tls.py b/libmproxy/protocol2/tls.py index 12c67f4e..970abe62 100644 --- a/libmproxy/protocol2/tls.py +++ b/libmproxy/protocol2/tls.py @@ -124,7 +124,7 @@ class TlsLayer(Layer): if old_upstream_sni != self.sni_for_upstream_connection: # Perform reconnect - if self._server_tls: + if self.server_conn and self._server_tls: self.yield_from_callback(Reconnect()) if self.client_sni: @@ -151,13 +151,14 @@ class TlsLayer(Layer): alpn_preference = netlib.http.http2.HTTP2Protocol.ALPN_PROTO_H2 ### + # TODO: Not if self.client_alpn_protos != options: # Perform reconnect - if self._server_tls: + # TODO: Avoid double reconnect. + if self.server_conn and self._server_tls: self.yield_from_callback(Reconnect()) self.client_alpn_protos = options - print("foo: %s" % options) if alpn_preference in options: return bytes(alpn_preference) |