diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-10-27 16:22:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 16:22:37 -0700 |
| commit | e71b634c58f274885f5ff9993c9982ae5ca5f31e (patch) | |
| tree | 8cac82b898629df45f69336fde588b67bc294e83 | |
| parent | 4ac4fe284908ac1aab0c973d180ca7274e8ddd06 (diff) | |
| parent | 62c9c3db4f0c614b19359215e111dbd4fac237c4 (diff) | |
| download | mitmproxy-e71b634c58f274885f5ff9993c9982ae5ca5f31e.tar.gz mitmproxy-e71b634c58f274885f5ff9993c9982ae5ca5f31e.tar.bz2 mitmproxy-e71b634c58f274885f5ff9993c9982ae5ca5f31e.zip | |
Merge pull request #1684 from mhils/1675
Fix #1675
| -rw-r--r-- | mitmproxy/connections.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mitmproxy/connections.py b/mitmproxy/connections.py index b565be78..143f576b 100644 --- a/mitmproxy/connections.py +++ b/mitmproxy/connections.py @@ -104,7 +104,11 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject): def convert_to_ssl(self, *args, **kwargs): super().convert_to_ssl(*args, **kwargs) self.timestamp_ssl_setup = time.time() - self.sni = self.connection.get_servername() + sni = self.connection.get_servername() + if sni: + self.sni = sni.decode("idna") + else: + self.sni = None self.cipher_name = self.connection.get_cipher_name() self.tls_version = self.connection.get_protocol_version_name() |