aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow_format_compat.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-08 11:41:30 +0100
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-08 11:41:30 +0100
commitec087a1960bdcfff5d8207a8090f35223b02fd49 (patch)
treeea0f24bb4d8d655a9f982ff5e5cd2c36d5c10f4e /libmproxy/flow_format_compat.py
parentcd744592f6dfebf9ba00ce8a35828b49fec1af5c (diff)
parentbdb763d9cff75eec4bb44d23bfc2ef6fa4871bcc (diff)
downloadmitmproxy-ec087a1960bdcfff5d8207a8090f35223b02fd49.tar.gz
mitmproxy-ec087a1960bdcfff5d8207a8090f35223b02fd49.tar.bz2
mitmproxy-ec087a1960bdcfff5d8207a8090f35223b02fd49.zip
Merge pull request #921 from mitmproxy/model-cleanup
Model Cleanup
Diffstat (limited to 'libmproxy/flow_format_compat.py')
-rw-r--r--libmproxy/flow_format_compat.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/libmproxy/flow_format_compat.py b/libmproxy/flow_format_compat.py
index 2b99b805..5af9b762 100644
--- a/libmproxy/flow_format_compat.py
+++ b/libmproxy/flow_format_compat.py
@@ -21,9 +21,23 @@ def convert_014_015(data):
return data
+def convert_015_016(data):
+ for m in ("request", "response"):
+ if "body" in data[m]:
+ data[m]["content"] = data[m].pop("body")
+ if "httpversion" in data[m]:
+ data[m]["http_version"] = data[m].pop("httpversion")
+ if "msg" in data["response"]:
+ data["response"]["reason"] = data["response"].pop("msg")
+ data["request"].pop("form_out", None)
+ data["version"] = (0, 16)
+ return data
+
+
converters = {
(0, 13): convert_013_014,
(0, 14): convert_014_015,
+ (0, 15): convert_015_016,
}