aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUjjwal Verma <ujjwalverma1111@gmail.com>2017-08-10 02:34:03 +0530
committerUjjwal Verma <ujjwalverma1111@gmail.com>2017-08-10 02:34:03 +0530
commita4048c8871b12a0632423f49af4f749e4968d36b (patch)
treecef77729751e495854a0cfa24a5c9b57ebaa5b82
parent6d9b5b0c062126d2ac47fa50795c7d560321e0f7 (diff)
downloadmitmproxy-a4048c8871b12a0632423f49af4f749e4968d36b.tar.gz
mitmproxy-a4048c8871b12a0632423f49af4f749e4968d36b.tar.bz2
mitmproxy-a4048c8871b12a0632423f49af4f749e4968d36b.zip
Fixes #2495
-rw-r--r--mitmproxy/io/compat.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/io/compat.py b/mitmproxy/io/compat.py
index 99da496d..da9d2a44 100644
--- a/mitmproxy/io/compat.py
+++ b/mitmproxy/io/compat.py
@@ -58,7 +58,7 @@ def convert_017_018(data):
# convert_unicode needs to be called for every dual release and the first py3-only release
data = convert_unicode(data)
- data["server_conn"]["ip_address"] = data["server_conn"].pop("peer_address")
+ data["server_conn"]["ip_address"] = data["server_conn"].pop("peer_address", None)
data["marked"] = False
data["version"] = (0, 18)
return data