aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools/web/master.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-12-17 09:15:11 +1300
committerGitHub <noreply@github.com>2016-12-17 09:15:11 +1300
commitcf15a3c3ef7806ee6d6fc0e01bc20c3c51070dbf (patch)
treed4f9c61b39a4ef568bab10c70971c466afaa7940 /mitmproxy/tools/web/master.py
parent6695ce462405b8691a0cc4d8110f67f2bd871bc5 (diff)
parent388fa7e716aa634f841059f50a731c38c71dd36f (diff)
downloadmitmproxy-cf15a3c3ef7806ee6d6fc0e01bc20c3c51070dbf.tar.gz
mitmproxy-cf15a3c3ef7806ee6d6fc0e01bc20c3c51070dbf.tar.bz2
mitmproxy-cf15a3c3ef7806ee6d6fc0e01bc20c3c51070dbf.zip
Merge pull request #1862 from mhils/remove-intercept-events
Remove intercept events, update view manually
Diffstat (limited to 'mitmproxy/tools/web/master.py')
-rw-r--r--mitmproxy/tools/web/master.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index db4855ff..68a3db70 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -31,9 +31,9 @@ class WebMaster(master.Master):
self.addons.add(*addons.default_addons())
self.addons.add(
+ intercept.Intercept(),
self.view,
self.events,
- intercept.Intercept(),
termlog.TermLog(),
)
self.app = app.Application(