From 906360f63f2afb4991dd2b38528798ad4efd0618 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Thu, 17 Sep 2015 15:16:33 +0200
Subject: code -> status_code, httpversion -> http_version

---
 libmproxy/web/app.py        | 8 ++++----
 libmproxy/web/static/app.js | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'libmproxy/web')

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
-- 
cgit v1.2.3