diff options
| author | Colin Bendell <colin@bendell.ca> | 2015-10-07 20:30:31 -0400 |
|---|---|---|
| committer | Colin Bendell <colin@bendell.ca> | 2015-10-07 20:30:31 -0400 |
| commit | 77aeac11a9353f290a9e4dfc1af1df4f597f48ee (patch) | |
| tree | 0674387c3e4fc1a0067e3cd5e367bd111f15ee92 | |
| parent | 09e36fae4ee10d029c79acbe1837c23411bf6e1a (diff) | |
| download | mitmproxy-77aeac11a9353f290a9e4dfc1af1df4f597f48ee.tar.gz mitmproxy-77aeac11a9353f290a9e4dfc1af1df4f597f48ee.tar.bz2 mitmproxy-77aeac11a9353f290a9e4dfc1af1df4f597f48ee.zip | |
Check if server connection hasn't yet been initiated
This fixes #761 when NoneType error is thrown when non-TLS requests initiate a client request but the server connection hasn't yet been initiated.
| -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..ab046247 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 None), 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 |