diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-17 19:20:28 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-17 19:20:28 +0200 |
| commit | 99129ab5a15bc4708eda80e4f56b46bb0f1efa86 (patch) | |
| tree | 661d6eaac3cdc47d2f436df9e8defb73e7a75880 /libmproxy/protocol2/http_proxy.py | |
| parent | a2b85048892626e6834df06e9022498814724636 (diff) | |
| parent | 38c456bb627c4570e0ed983229ec8ef2f120a4b6 (diff) | |
| download | mitmproxy-99129ab5a15bc4708eda80e4f56b46bb0f1efa86.tar.gz mitmproxy-99129ab5a15bc4708eda80e4f56b46bb0f1efa86.tar.bz2 mitmproxy-99129ab5a15bc4708eda80e4f56b46bb0f1efa86.zip | |
Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
Conflicts:
libmproxy/protocol2/http.py
Diffstat (limited to 'libmproxy/protocol2/http_proxy.py')
| -rw-r--r-- | libmproxy/protocol2/http_proxy.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/protocol2/http_proxy.py b/libmproxy/protocol2/http_proxy.py index 3cc7fee2..19b5f7ef 100644 --- a/libmproxy/protocol2/http_proxy.py +++ b/libmproxy/protocol2/http_proxy.py @@ -1,12 +1,12 @@ from __future__ import (absolute_import, print_function, division) from .layer import Layer, ServerConnectionMixin -from .http import HttpLayer +from .http import Http1Layer class HttpProxy(Layer, ServerConnectionMixin): def __call__(self): - layer = HttpLayer(self, "regular") + layer = Http1Layer(self, "regular") for message in layer(): if not self._handle_server_message(message): yield message @@ -17,7 +17,7 @@ class HttpUpstreamProxy(Layer, ServerConnectionMixin): super(HttpUpstreamProxy, self).__init__(ctx, server_address=server_address) def __call__(self): - layer = HttpLayer(self, "upstream") + layer = Http1Layer(self, "upstream") for message in layer(): if not self._handle_server_message(message): - yield message
\ No newline at end of file + yield message |