aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-16 12:52:34 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-16 12:52:34 +0200
commitc04fa1b233224d28e85be34ab5b6a8718497488c (patch)
tree4f32abaf5ee8eec38194e75b6a5fb2cc22ec9911 /libmproxy
parent61afac863791aaf08b5b6d32c216de67144f8401 (diff)
downloadmitmproxy-c04fa1b233224d28e85be34ab5b6a8718497488c.tar.gz
mitmproxy-c04fa1b233224d28e85be34ab5b6a8718497488c.tar.bz2
mitmproxy-c04fa1b233224d28e85be34ab5b6a8718497488c.zip
minor fixes
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/protocol2/http_protocol_mock.py4
-rw-r--r--libmproxy/protocol2/http_proxy.py1
2 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/protocol2/http_protocol_mock.py b/libmproxy/protocol2/http_protocol_mock.py
index 22f3dc14..dd3643f6 100644
--- a/libmproxy/protocol2/http_protocol_mock.py
+++ b/libmproxy/protocol2/http_protocol_mock.py
@@ -11,14 +11,14 @@ class HTTP1(object):
"""
:type connection: object
"""
- return HTTPRequest.wrap(HTTP1Protocol(connection).read_request(*args, **kwargs))
+ return HTTPRequest.from_protocol(HTTP1Protocol(connection), *args, **kwargs)
@staticmethod
def read_response(connection, *args, **kwargs):
"""
:type connection: object
"""
- return HTTPResponse.wrap(HTTP1Protocol(connection).read_response(*args, **kwargs))
+ return HTTPResponse.from_protocol(HTTP1Protocol(connection), *args, **kwargs)
@staticmethod
def read_http_body(connection, *args, **kwargs):
diff --git a/libmproxy/protocol2/http_proxy.py b/libmproxy/protocol2/http_proxy.py
index 9488e367..ca70b012 100644
--- a/libmproxy/protocol2/http_proxy.py
+++ b/libmproxy/protocol2/http_proxy.py
@@ -1,6 +1,7 @@
from __future__ import (absolute_import, print_function, division)
from .layer import Layer, ServerConnectionMixin
+from .http import HttpLayer
class HttpProxy(Layer, ServerConnectionMixin):