diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-03-10 13:48:13 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-03-10 13:48:13 +1300 |
| commit | d57a1d60352d0c47124a57a7ee956d4d5159969f (patch) | |
| tree | 882536152421416442a9b56308148c01fb224714 /libmproxy | |
| parent | 3f2d1381d08e92e84c510396b991917034a48640 (diff) | |
| parent | 23f7214fc3e10d8a0cc9a61256b01fac117f77f2 (diff) | |
| download | mitmproxy-d57a1d60352d0c47124a57a7ee956d4d5159969f.tar.gz mitmproxy-d57a1d60352d0c47124a57a7ee956d4d5159969f.tar.bz2 mitmproxy-d57a1d60352d0c47124a57a7ee956d4d5159969f.zip | |
Merge remote-tracking branch 'meeee/master'
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/proxy.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 31308e6f..33e50890 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -107,7 +107,7 @@ def read_chunked(fp, limit): def read_http_body(rfile, connection, headers, all, limit): if 'transfer-encoding' in headers: - if not ",".join(headers["transfer-encoding"]) == "chunked": + if not ",".join(headers["transfer-encoding"]).lower() == "chunked": raise IOError('Invalid transfer-encoding') content = read_chunked(rfile, limit) elif "content-length" in headers: @@ -185,10 +185,14 @@ class FileLike: result += data return result - def readline(self): + def readline(self, size = None): result = '' + bytes_read = 0 while True: + if size is not None and bytes_read >= size: + break ch = self.read(1) + bytes_read += 1 if not ch: break else: |