aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-31 17:05:52 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-31 17:05:52 +0200
commitb04e6e56ab1e69853abebfb950539e3a3aefbdf2 (patch)
treec1907cda3384aee854dbeb5132bed029ae26e595 /libmproxy/proxy
parent41e6e538dfa758b7d9f867f85f62e881ae408684 (diff)
downloadmitmproxy-b04e6e56ab1e69853abebfb950539e3a3aefbdf2.tar.gz
mitmproxy-b04e6e56ab1e69853abebfb950539e3a3aefbdf2.tar.bz2
mitmproxy-b04e6e56ab1e69853abebfb950539e3a3aefbdf2.zip
update inline script hooks
Diffstat (limited to 'libmproxy/proxy')
-rw-r--r--libmproxy/proxy/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index b565ef86..e9e8df09 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -106,6 +106,10 @@ class ConnectionHandler(object):
self.log("clientconnect", "info")
root_layer = self._create_root_layer()
+ root_layer = self.channel.ask("clientconnect", root_layer)
+ if root_layer == Kill:
+ def root_layer():
+ raise Kill()
try:
root_layer()
@@ -128,6 +132,7 @@ class ConnectionHandler(object):
print("Please lodge a bug report at: https://github.com/mitmproxy/mitmproxy", file=sys.stderr)
self.log("clientdisconnect", "info")
+ self.channel.tell("clientdisconnect", root_layer)
self.client_conn.finish()
def log(self, msg, level):