aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-10-31 01:15:25 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-11-08 17:43:46 +0100
commit62ca89649237cb0aff63b1fd3d7729b42134bdd1 (patch)
tree040e393939425f0acb814c1585ea127f5fd4349e
parent184e29e119a56762af7cb71cc872af12f92778e8 (diff)
downloadmitmproxy-62ca89649237cb0aff63b1fd3d7729b42134bdd1.tar.gz
mitmproxy-62ca89649237cb0aff63b1fd3d7729b42134bdd1.tar.bz2
mitmproxy-62ca89649237cb0aff63b1fd3d7729b42134bdd1.zip
fix mitmweb
-rw-r--r--mitmproxy/tools/web/app.py2
-rw-r--r--web/conf.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py
index bbdc2bf9..e085b4a8 100644
--- a/mitmproxy/tools/web/app.py
+++ b/mitmproxy/tools/web/app.py
@@ -341,7 +341,7 @@ class FlowContentView(RequestHandler):
message = getattr(self.flow, message)
description, lines, error = contentviews.get_message_content_view(
- contentviews.get(content_view.replace('_', ' ')).name, message
+ content_view.replace('_', ' '), message
)
# if error:
# add event log
diff --git a/web/conf.js b/web/conf.js
index cc616a63..1c90b1cf 100644
--- a/web/conf.js
+++ b/web/conf.js
@@ -1,8 +1,8 @@
var conf = {
src: "src/",
- dist: "../mitmproxy/web",
- static: "../mitmproxy/web/static",
+ dist: "../mitmproxy/tools/web",
+ static: "../mitmproxy/tools/web/static",
js: {
// Don't package these in the vendor distribution
vendor_excludes: [