aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-16 18:45:22 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-16 18:45:22 +0200
commit0af060897854e0e0fc8207af02d22bec9eacab12 (patch)
tree8f5206386bb481a813f1b6891c30d5d2d33924ba /libmproxy/flow.py
parent436a9ea8398e25709f139fde609aa74e8fb3f3f8 (diff)
downloadmitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.tar.gz
mitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.tar.bz2
mitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.zip
adjust to netlib changes
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index d037d36e..d735b9ec 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -12,7 +12,8 @@ import urlparse
from netlib import wsgi
-from netlib.http.semantics import CONTENT_MISSING, Headers
+from netlib.exceptions import HttpException
+from netlib.http import CONTENT_MISSING, Headers, http1
import netlib.http
from . import controller, tnetstring, filt, script, version
from .onboarding import app
@@ -161,9 +162,8 @@ class StreamLargeBodies(object):
def run(self, flow, is_request):
r = flow.request if is_request else flow.response
- code = flow.response.code if flow.response else None
- expected_size = netlib.http.http1.HTTP1Protocol.expected_http_body_size(
- r.headers, is_request, flow.request.method, code
+ expected_size = http1.expected_http_body_size(
+ flow.request, flow.response if not is_request else None
)
if not (0 <= expected_size <= self.max_size):
# r.stream may already be a callable, which we want to preserve.
@@ -842,7 +842,7 @@ class FlowMaster(controller.Master):
host,
port,
path,
- (1, 1),
+ b"HTTP/1.1",
headers,
None,
None,
@@ -1000,7 +1000,7 @@ class FlowMaster(controller.Master):
try:
if self.stream_large_bodies:
self.stream_large_bodies.run(f, False)
- except netlib.http.HttpError:
+ except HttpException:
f.reply(Kill)
return