aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2013-12-08 14:14:57 +0100
committerMaximilian Hils <git@maximilianhils.com>2013-12-08 14:14:57 +0100
commita509a9037b265d8a96756af91e2978ab95a2b81e (patch)
tree16509a91179ec886ef30e2036ec45ad5dc685e14 /libmproxy/flow.py
parent4dcb2435fc3fba64a0cdc8d2acd5038fc140da13 (diff)
parente3c69fd105f925009fdf31efe8598f70e2950ab4 (diff)
downloadmitmproxy-a509a9037b265d8a96756af91e2978ab95a2b81e.tar.gz
mitmproxy-a509a9037b265d8a96756af91e2978ab95a2b81e.tar.bz2
mitmproxy-a509a9037b265d8a96756af91e2978ab95a2b81e.zip
Merge branch 'master' into 0.10
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index b6770806..96103ddb 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -1581,6 +1581,13 @@ class FlowMaster(controller.Master):
self.run_script_hook("clientdisconnect", r)
r.reply()
+ def handle_serverconnection(self, sc):
+ # To unify the mitmproxy script API, we call the script hook "serverconnect" rather than "serverconnection".
+ # As things are handled differently in libmproxy (ClientConnect + ClientDisconnect vs ServerConnection class),
+ # there is no "serverdisonnect" event at the moment.
+ self.run_script_hook("serverconnect", sc)
+ sc.reply()
+
def handle_error(self, r):
f = self.state.add_error(r)
if f: