diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-10-08 12:37:43 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-10-08 12:37:43 +0200 |
| commit | 442f079e0b4e715897318f378f8a08d7f2271990 (patch) | |
| tree | 7979f50d10e8a43dfe7c7f374ea3460d2e5a4374 | |
| parent | 09e36fae4ee10d029c79acbe1837c23411bf6e1a (diff) | |
| parent | a85e4bc75c93453f3a3e9cb2bca105d370f346a5 (diff) | |
| download | mitmproxy-442f079e0b4e715897318f378f8a08d7f2271990.tar.gz mitmproxy-442f079e0b4e715897318f378f8a08d7f2271990.tar.bz2 mitmproxy-442f079e0b4e715897318f378f8a08d7f2271990.zip | |
Merge pull request #797 from colinbendell/colinbendell-patch-1
server_conn.address might not yet be established
| -rw-r--r-- | libmproxy/models/connections.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/models/connections.py b/libmproxy/models/connections.py index f1e10de9..95ffbaf6 100644 --- a/libmproxy/models/connections.py +++ b/libmproxy/models/connections.py @@ -135,8 +135,8 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject): def get_state(self, short=False): d = super(ServerConnection, self).get_state(short) d.update( - address={"address": self.address(), - "use_ipv6": self.address.use_ipv6}, + address=({"address": self.address(), + "use_ipv6": self.address.use_ipv6} if self.address else {}), source_address=({"address": self.source_address(), "use_ipv6": self.source_address.use_ipv6} if self.source_address else None), cert=self.cert.to_pem() if self.cert else None |