aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol2/http_proxy.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-30 02:27:38 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-30 02:27:38 +0200
commit1dd09a5509219e7390abbb8c0b6818c7e792daa1 (patch)
treeef1f433ebbcb05003b7648f8cabdfce7f2f00de5 /libmproxy/protocol2/http_proxy.py
parentdd7f50d64bef38fa67b4cace91913d03691dde26 (diff)
downloadmitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.tar.gz
mitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.tar.bz2
mitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.zip
always insert tls layer for inline script upgrades
Diffstat (limited to 'libmproxy/protocol2/http_proxy.py')
-rw-r--r--libmproxy/protocol2/http_proxy.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/libmproxy/protocol2/http_proxy.py b/libmproxy/protocol2/http_proxy.py
index b3389eb7..2876c022 100644
--- a/libmproxy/protocol2/http_proxy.py
+++ b/libmproxy/protocol2/http_proxy.py
@@ -1,12 +1,11 @@
from __future__ import (absolute_import, print_function, division)
from .layer import Layer, ServerConnectionMixin
-from .http import Http1Layer
class HttpProxy(Layer, ServerConnectionMixin):
def __call__(self):
- layer = Http1Layer(self, "regular")
+ layer = self.ctx.next_layer(self)
try:
layer()
finally:
@@ -19,7 +18,7 @@ class HttpUpstreamProxy(Layer, ServerConnectionMixin):
super(HttpUpstreamProxy, self).__init__(ctx, server_address=server_address)
def __call__(self):
- layer = Http1Layer(self, "upstream")
+ layer = self.ctx.next_layer(self)
try:
layer()
finally: