aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-03-04 11:48:05 +0100
committerGitHub <noreply@github.com>2017-03-04 11:48:05 +0100
commitf71c11559ce99a2f6b3e54dcc0baa2e7044b4fd0 (patch)
treeef75fb2781b3b075751f5ec6b45a58b2b09208e8
parent78fd5a9dadbf16cebe46243ef706069b857ff3d9 (diff)
parent40943f5618d0cc9e5ce100df4620aae9cdc236ac (diff)
downloadmitmproxy-f71c11559ce99a2f6b3e54dcc0baa2e7044b4fd0.tar.gz
mitmproxy-f71c11559ce99a2f6b3e54dcc0baa2e7044b4fd0.tar.bz2
mitmproxy-f71c11559ce99a2f6b3e54dcc0baa2e7044b4fd0.zip
Merge pull request #2081 from s4chin/add-pretty-host
web: Fix #1888
-rw-r--r--mitmproxy/tools/web/app.py1
-rw-r--r--web/src/js/flow/utils.js6
2 files changed, 2 insertions, 5 deletions
diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py
index 893c3dde..35b549ee 100644
--- a/mitmproxy/tools/web/app.py
+++ b/mitmproxy/tools/web/app.py
@@ -65,6 +65,7 @@ def flow_to_json(flow: mitmproxy.flow.Flow) -> dict:
"timestamp_start": flow.request.timestamp_start,
"timestamp_end": flow.request.timestamp_end,
"is_replay": flow.request.is_replay,
+ "pretty_host": flow.request.pretty_host,
}
if flow.response:
if flow.response.raw_content:
diff --git a/web/src/js/flow/utils.js b/web/src/js/flow/utils.js
index cd174069..3c38058e 100644
--- a/web/src/js/flow/utils.js
+++ b/web/src/js/flow/utils.js
@@ -54,16 +54,12 @@ export var MessageUtils = {
};
export var RequestUtils = _.extend(MessageUtils, {
- pretty_host: function (request) {
- //FIXME: Add hostheader
- return request.host;
- },
pretty_url: function (request) {
var port = "";
if (defaultPorts[request.scheme] !== request.port) {
port = ":" + request.port;
}
- return request.scheme + "://" + this.pretty_host(request) + port + request.path;
+ return request.scheme + "://" + request.pretty_host + port + request.path;
}
});