aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/root_context.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-08 15:36:37 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-08 15:36:37 +0200
commit4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49 (patch)
treed585d558f1860869f00e00199761894d6bd47834 /libmproxy/proxy/root_context.py
parentc3ba98b68127b1a0d974e564c0c9af97b97f2a06 (diff)
parent8dfa15c2d460839667092e578311fad53cf7bea9 (diff)
downloadmitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.tar.gz
mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.tar.bz2
mitmproxy-4b8e162a8b5b72c054b5d0f9bcc7801ed8d90e49.zip
Merge branch 'master' into readthedocs
Diffstat (limited to 'libmproxy/proxy/root_context.py')
-rw-r--r--libmproxy/proxy/root_context.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/libmproxy/proxy/root_context.py b/libmproxy/proxy/root_context.py
index 87a540c0..dccdf023 100644
--- a/libmproxy/proxy/root_context.py
+++ b/libmproxy/proxy/root_context.py
@@ -40,7 +40,10 @@ class RootContext(object):
Returns:
The next layer
"""
+ layer = self._next_layer(top_layer)
+ return self.channel.ask("next_layer", layer)
+ def _next_layer(self, top_layer):
# 1. Check for --ignore.
if self.config.check_ignore(top_layer.server_conn.address):
return RawTCPLayer(top_layer, logging=False)
@@ -119,4 +122,4 @@ class RootContext(object):
class Log(object):
def __init__(self, msg, level="info"):
self.msg = msg
- self.level = level \ No newline at end of file
+ self.level = level