aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/web
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-17 15:16:33 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-17 15:16:33 +0200
commit906360f63f2afb4991dd2b38528798ad4efd0618 (patch)
treea89f2d2d1a768f85ea604589ade4df85b7c09d22 /libmproxy/web
parent12984f149cab1308b97b5ae1bdbe375787057e7e (diff)
downloadmitmproxy-906360f63f2afb4991dd2b38528798ad4efd0618.tar.gz
mitmproxy-906360f63f2afb4991dd2b38528798ad4efd0618.tar.bz2
mitmproxy-906360f63f2afb4991dd2b38528798ad4efd0618.zip
code -> status_code, httpversion -> http_version
Diffstat (limited to 'libmproxy/web')
-rw-r--r--libmproxy/web/app.py8
-rw-r--r--libmproxy/web/static/app.js8
2 files changed, 8 insertions, 8 deletions
diff --git a/libmproxy/web/app.py b/libmproxy/web/app.py
index 8eee6dce..5c80584d 100644
--- a/libmproxy/web/app.py
+++ b/libmproxy/web/app.py
@@ -128,7 +128,7 @@ class FlowHandler(RequestHandler):
if a == "request":
request = flow.request
for k, v in b.iteritems():
- if k in ["method", "scheme", "host", "path", "httpversion"]:
+ if k in ["method", "scheme", "host", "path", "http_version"]:
setattr(request, k, str(v))
elif k == "port":
request.port = int(v)
@@ -143,9 +143,9 @@ class FlowHandler(RequestHandler):
if k == "msg":
response.msg = str(v)
elif k == "code":
- response.code = int(v)
- elif k == "httpversion":
- response.httpversion = str(v)
+ response.status_code = int(v)
+ elif k == "http_version":
+ response.http_version = str(v)
elif k == "headers":
response.headers.load_state(v)
else:
diff --git a/libmproxy/web/static/app.js b/libmproxy/web/static/app.js
index b9767153..edcc95ba 100644
--- a/libmproxy/web/static/app.js
+++ b/libmproxy/web/static/app.js
@@ -2098,7 +2098,7 @@ var RequestLine = React.createClass({displayName: "RequestLine",
render: function () {
var flow = this.props.flow;
var url = flowutils.RequestUtils.pretty_url(flow.request);
- var httpver = "HTTP/" + flow.request.httpversion.join(".");
+ var httpver = "HTTP/" + flow.request.http_version.join(".");
return React.createElement("div", {className: "first-line request-line"},
React.createElement(ValueEditor, {
@@ -2144,7 +2144,7 @@ var RequestLine = React.createClass({displayName: "RequestLine",
var ver = flowutils.parseHttpVersion(nextVer);
actions.FlowActions.update(
this.props.flow,
- {request: {httpversion: ver}}
+ {request: {http_version: ver}}
);
}
});
@@ -2152,7 +2152,7 @@ var RequestLine = React.createClass({displayName: "RequestLine",
var ResponseLine = React.createClass({displayName: "ResponseLine",
render: function () {
var flow = this.props.flow;
- var httpver = "HTTP/" + flow.response.httpversion.join(".");
+ var httpver = "HTTP/" + flow.response.http_version.join(".");
return React.createElement("div", {className: "first-line response-line"},
React.createElement(ValueEditor, {
ref: "httpVersion",
@@ -5734,4 +5734,4 @@ module.exports = {
},{"./actions.js":2,"jquery":"jquery","lodash":"lodash","react":"react"}]},{},[3])
-//# sourceMappingURL=app.js.map \ No newline at end of file
+//# sourceMappingURL=app.js.map