diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:54:53 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:54:53 +0200 |
commit | c11ab3676dee2a490994665e867bcfcb26945777 (patch) | |
tree | f898c23973b10079fa4479238d5f8f5a8e61d46e /libmproxy/protocol/http.py | |
parent | 6661770d4eee3eab3305793613586f3684c24ae9 (diff) | |
parent | 6075957a9730c6ca5c4c7361bd774345f83d6f59 (diff) | |
download | mitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.tar.gz mitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.tar.bz2 mitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.zip |
Merge branch 'http-models'
Diffstat (limited to 'libmproxy/protocol/http.py')
-rw-r--r-- | libmproxy/protocol/http.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 34bccaf8..50765e50 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -54,7 +54,7 @@ class _StreamingHttpLayer(_HttpLayer): def read_response(self, request): response = self.read_response_headers() - response.body = b"".join( + response.content = b"".join( self.read_response_body(request, response) ) return response @@ -66,10 +66,10 @@ class _StreamingHttpLayer(_HttpLayer): raise NotImplementedError() def send_response(self, response): - if response.body == CONTENT_MISSING: + if response.content == CONTENT_MISSING: raise HttpException("Cannot assemble flow with CONTENT_MISSING") self.send_response_headers(response) - self.send_response_body(response, [response.body]) + self.send_response_body(response, [response.content]) class Http1Layer(_StreamingHttpLayer): |