diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-02-27 14:47:50 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-02-27 14:47:50 +0100 |
| commit | 8d975e80ffbbf2af5f1d097a21dbb33e17acc6a1 (patch) | |
| tree | 23989c9af0e84e06fc844b6029ec8087014c5387 /libmproxy | |
| parent | 595bde2202880971907096e4eeddb2b298c02d07 (diff) | |
| parent | 5916767e036c6c7a816aa964bcd2b2721c7316bb (diff) | |
| download | mitmproxy-8d975e80ffbbf2af5f1d097a21dbb33e17acc6a1.tar.gz mitmproxy-8d975e80ffbbf2af5f1d097a21dbb33e17acc6a1.tar.bz2 mitmproxy-8d975e80ffbbf2af5f1d097a21dbb33e17acc6a1.zip | |
Merge remote-tracking branch 'sakurai/feature/issue319'
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/protocol/http.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 046d0b42..51fd503f 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -1332,7 +1332,12 @@ class HTTPHandler(ProtocolHandler): # incrementally: h = flow.response._assemble_head(preserve_transfer_encoding=True) self.c.client_conn.send(h) - for chunk in http.read_http_body_chunked(self.c.server_conn.rfile, + for chunk in callable(flow.response.stream) and \ + flow.response.stream(http.read_http_body_chunked(self.c.server_conn.rfile, + flow.response.headers, + self.c.config.body_size_limit, flow.request.method, + flow.response.code, False, 4096)) or \ + http.read_http_body_chunked(self.c.server_conn.rfile, flow.response.headers, self.c.config.body_size_limit, flow.request.method, flow.response.code, False, 4096): |