aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2013-07-01 17:37:15 -0700
committerAldo Cortesi <aldo@corte.si>2013-07-01 17:37:15 -0700
commitc4d03d8b85b428a598c4816a2020f4ed04e2a0f5 (patch)
tree084bec5ab0f7cbf7594091180e079b25562e4ce4
parent1f029306d65b8d9d7e3dd5c81169d6a6dba3ab8e (diff)
parent0afd3fc42f1ff31a89b0080b281ab79bf6b566d4 (diff)
downloadmitmproxy-c4d03d8b85b428a598c4816a2020f4ed04e2a0f5.tar.gz
mitmproxy-c4d03d8b85b428a598c4816a2020f4ed04e2a0f5.tar.bz2
mitmproxy-c4d03d8b85b428a598c4816a2020f4ed04e2a0f5.zip
Merge pull request #137 from caujka/master
Handling for EOF reading error in gzipped content
-rw-r--r--libmproxy/encoding.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/encoding.py b/libmproxy/encoding.py
index 9f8acbe9..4b80d38c 100644
--- a/libmproxy/encoding.py
+++ b/libmproxy/encoding.py
@@ -54,7 +54,7 @@ def decode_gzip(content):
gfile = gzip.GzipFile(fileobj=cStringIO.StringIO(content))
try:
return gfile.read()
- except IOError:
+ except (IOError, EOFError):
return None
def encode_gzip(content):