diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-29 20:54:54 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-29 20:54:54 +0200 |
| commit | 4a8fd79e334661c1a11cd1cd28d62e6999b384d9 (patch) | |
| tree | b7ec396b997ecc074cf0c0ebc14c763a64e4c96b /netlib | |
| parent | 1265945f55604f32d99c3dd7c1efd13b3f2ecd9b (diff) | |
| download | mitmproxy-4a8fd79e334661c1a11cd1cd28d62e6999b384d9.tar.gz mitmproxy-4a8fd79e334661c1a11cd1cd28d62e6999b384d9.tar.bz2 mitmproxy-4a8fd79e334661c1a11cd1cd28d62e6999b384d9.zip | |
don't yield prefix and suffix
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/http/http1/protocol.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/netlib/http/http1/protocol.py b/netlib/http/http1/protocol.py index 6b4489fb..50975818 100644 --- a/netlib/http/http1/protocol.py +++ b/netlib/http/http1/protocol.py @@ -258,9 +258,7 @@ class HTTP1Protocol(semantics.ProtocolMixin): def read_http_body(self, *args, **kwargs): - return "".join( - content for _, content, _ in self.read_http_body_chunked(*args, **kwargs) - ) + return "".join(self.read_http_body_chunked(*args, **kwargs)) def read_http_body_chunked( @@ -308,7 +306,7 @@ class HTTP1Protocol(semantics.ProtocolMixin): while bytes_left: chunk_size = min(bytes_left, max_chunk_size) content = self.tcp_handler.rfile.read(chunk_size) - yield "", content, "" + yield content bytes_left -= chunk_size else: bytes_left = limit or -1 @@ -317,7 +315,7 @@ class HTTP1Protocol(semantics.ProtocolMixin): content = self.tcp_handler.rfile.read(chunk_size) if not content: return - yield "", content, "" + yield content bytes_left -= chunk_size not_done = self.tcp_handler.rfile.read(1) if not_done: @@ -418,7 +416,7 @@ class HTTP1Protocol(semantics.ProtocolMixin): suffix = self.tcp_handler.rfile.readline(5) if suffix != '\r\n': raise HttpError(code, "Malformed chunked body") - yield line, chunk, '\r\n' + yield chunk if length == 0: return |