diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-08 15:36:37 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-08 15:36:37 +0200 |
commit | 4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49 (patch) | |
tree | d585d558f1860869f00e00199761894d6bd47834 /libmproxy/script.py | |
parent | c3ba98b68127b1a0d974e564c0c9af97b97f2a06 (diff) | |
parent | 8dfa15c2d460839667092e578311fad53cf7bea9 (diff) | |
download | mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.tar.gz mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.tar.bz2 mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.zip |
Merge branch 'master' into readthedocs
Diffstat (limited to 'libmproxy/script.py')
-rw-r--r-- | libmproxy/script.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/script.py b/libmproxy/script.py index fb04f8c3..9526d3af 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -183,7 +183,8 @@ def concurrent(fn): "error", "clientconnect", "serverconnect", - "clientdisconnect"): + "clientdisconnect", + "next_layer"): def _concurrent(ctx, obj): _handle_concurrent_reply(fn, obj, ctx, obj) |