diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-07-28 11:19:07 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-07-28 11:19:07 +1200 |
| commit | c89c4361c376765c666cc6ed0ab5834b2418082d (patch) | |
| tree | ad5c9e10f6797c92f281e71f5fc49af427253528 /libmproxy/console.py | |
| parent | 78049abac123332123990994b50a70bc789b7514 (diff) | |
| parent | acd511f6767cdcc332851e44a62fbd843399446a (diff) | |
| download | mitmproxy-c89c4361c376765c666cc6ed0ab5834b2418082d.tar.gz mitmproxy-c89c4361c376765c666cc6ed0ab5834b2418082d.tar.bz2 mitmproxy-c89c4361c376765c666cc6ed0ab5834b2418082d.zip | |
Merge remote-tracking branch 'alts/encoding'
Diffstat (limited to 'libmproxy/console.py')
| -rw-r--r-- | libmproxy/console.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index 438e3305..67e64d37 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -543,8 +543,7 @@ class ConnectionView(WWrap): conn = self.flow.response e = conn.headers["content-encoding"] or ["identity"] if e[0] != "identity": - conn.content = encoding.decode(e[0], conn.content) - conn.headers["content-encoding"] = ["identity"] + conn.decode() else: self.master.prompt_onekey( "Select encoding: ", @@ -563,11 +562,7 @@ class ConnectionView(WWrap): "z": "gzip", "d": "deflate", } - conn.content = encoding.encode( - encoding_map[key], - conn.content - ) - conn.headers["content-encoding"] = [encoding_map[key]] + conn.encode(encoding_map[key]) self.master.refresh_connection(self.flow) |