From e9934cc008417cb1aed694f7f24133abac0815eb Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 8 Feb 2016 02:10:10 +0100 Subject: simplify state management --- libmproxy/flow_format_compat.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'libmproxy/flow_format_compat.py') diff --git a/libmproxy/flow_format_compat.py b/libmproxy/flow_format_compat.py index 2b99b805..9920dfce 100644 --- a/libmproxy/flow_format_compat.py +++ b/libmproxy/flow_format_compat.py @@ -21,9 +21,22 @@ 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["version"] = (0, 16) + return data + + converters = { (0, 13): convert_013_014, (0, 14): convert_014_015, + (0, 15): convert_015_016, } -- cgit v1.2.3 From bdb763d9cff75eec4bb44d23bfc2ef6fa4871bcc Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 8 Feb 2016 04:19:25 +0100 Subject: make stateobject simpler and stricter --- libmproxy/flow_format_compat.py | 1 + 1 file changed, 1 insertion(+) (limited to 'libmproxy/flow_format_compat.py') diff --git a/libmproxy/flow_format_compat.py b/libmproxy/flow_format_compat.py index 9920dfce..5af9b762 100644 --- a/libmproxy/flow_format_compat.py +++ b/libmproxy/flow_format_compat.py @@ -29,6 +29,7 @@ def convert_015_016(data): 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 -- cgit v1.2.3