diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:53:59 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:53:59 +0200 |
| commit | 67229fbdf7be2f3bb591a9da77f75c05ed0ab269 (patch) | |
| tree | aa94ff2eacbe2c5d46dbad3f41c9ca2eae849f73 /netlib/encoding.py | |
| parent | 5261bcdf4b0976b8db3295292143282b34f10c51 (diff) | |
| parent | 23d13e4c1282bc46c54222479c3b83032dad3335 (diff) | |
| download | mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.gz mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.bz2 mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.zip | |
Merge branch 'http-models'
Diffstat (limited to 'netlib/encoding.py')
| -rw-r--r-- | netlib/encoding.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/netlib/encoding.py b/netlib/encoding.py index 4c11273b..14479e00 100644 --- a/netlib/encoding.py +++ b/netlib/encoding.py @@ -12,6 +12,8 @@ ENCODINGS = {"identity", "gzip", "deflate"} def decode(e, content): + if not isinstance(content, bytes): + return None encoding_map = { "identity": identity, "gzip": decode_gzip, @@ -23,6 +25,8 @@ def decode(e, content): def encode(e, content): + if not isinstance(content, bytes): + return None encoding_map = { "identity": identity, "gzip": encode_gzip, |