aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/web/app.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-16 20:24:48 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-16 20:24:48 +0200
commit8fbed971ae4a84e875f1072805b17cc7ada39fad (patch)
tree09c31384b2b1d22680534af8ff40ae724a13e05b /libmproxy/web/app.py
parentee6969c1fac20d592e0775bfe074b4bcfcf83461 (diff)
parent0af060897854e0e0fc8207af02d22bec9eacab12 (diff)
downloadmitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.tar.gz
mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.tar.bz2
mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.zip
Merge pull request #768 from mitmproxy/netlib-http1-refactor
Adjust to netlib changes
Diffstat (limited to 'libmproxy/web/app.py')
-rw-r--r--libmproxy/web/app.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/libmproxy/web/app.py b/libmproxy/web/app.py
index 2517e7ad..8eee6dce 100644
--- a/libmproxy/web/app.py
+++ b/libmproxy/web/app.py
@@ -128,12 +128,10 @@ class FlowHandler(RequestHandler):
if a == "request":
request = flow.request
for k, v in b.iteritems():
- if k in ["method", "scheme", "host", "path"]:
+ if k in ["method", "scheme", "host", "path", "httpversion"]:
setattr(request, k, str(v))
elif k == "port":
request.port = int(v)
- elif k == "httpversion":
- request.httpversion = tuple(int(x) for x in v)
elif k == "headers":
request.headers.load_state(v)
else:
@@ -147,7 +145,7 @@ class FlowHandler(RequestHandler):
elif k == "code":
response.code = int(v)
elif k == "httpversion":
- response.httpversion = tuple(int(x) for x in v)
+ response.httpversion = str(v)
elif k == "headers":
response.headers.load_state(v)
else: