aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy/tools')
-rw-r--r--mitmproxy/tools/web/app.py2
-rw-r--r--mitmproxy/tools/web/master.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py
index 7788497e..e5f74af3 100644
--- a/mitmproxy/tools/web/app.py
+++ b/mitmproxy/tools/web/app.py
@@ -251,7 +251,7 @@ class FlowHandler(RequestHandler):
elif k == "port":
request.port = int(v)
elif k == "headers":
- request.headers.set_state(v)
+ request.headers.set_state((a.encode(), b.encode()) for a, b in v)
elif k == "content":
request.text = v
else:
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index 605cdf18..e35815ad 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -21,7 +21,8 @@ class Stop(Exception):
class _WebState():
def add_log(self, e, level):
- self._last_event_id += 1
+ # server-side log ids are odd
+ self._last_event_id += 2
entry = {
"id": self._last_event_id,
"message": e,