aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/controller.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-18 12:02:35 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-18 12:02:35 +1300
commitd5056c5627dda172350d6ae72ace315be55a0cc9 (patch)
treec8867cb81b14c643feb5c81c777e9097de49c6f0 /mitmproxy/controller.py
parent825b02d495ef762f22b44d48ed9d923f8c54220a (diff)
downloadmitmproxy-d5056c5627dda172350d6ae72ace315be55a0cc9.tar.gz
mitmproxy-d5056c5627dda172350d6ae72ace315be55a0cc9.tar.bz2
mitmproxy-d5056c5627dda172350d6ae72ace315be55a0cc9.zip
accept_addon -> resume, intercept/resume events
Diffstat (limited to 'mitmproxy/controller.py')
-rw-r--r--mitmproxy/controller.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py
index 148fda77..a225634a 100644
--- a/mitmproxy/controller.py
+++ b/mitmproxy/controller.py
@@ -27,6 +27,9 @@ Events = frozenset([
"responseheaders",
"error",
+ "intercept",
+ "resume",
+
"websocket_handshake",
"next_layer",