diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 02:26:47 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 02:26:47 +0200 |
| commit | 88375ad64aa2f53b9447df1ccd7aa7ee77cb04ef (patch) | |
| tree | d8bb3f92ae9b32fc9bbc33b85789d50fb6c45515 /libmproxy/models/http.py | |
| parent | 6d27901b6fe44a651788e07d9e2de4d367be925e (diff) | |
| download | mitmproxy-88375ad64aa2f53b9447df1ccd7aa7ee77cb04ef.tar.gz mitmproxy-88375ad64aa2f53b9447df1ccd7aa7ee77cb04ef.tar.bz2 mitmproxy-88375ad64aa2f53b9447df1ccd7aa7ee77cb04ef.zip | |
fix minor bugs, add py.test compatibility
Diffstat (limited to 'libmproxy/models/http.py')
| -rw-r--r-- | libmproxy/models/http.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmproxy/models/http.py b/libmproxy/models/http.py index c0a2c55a..5a83cb46 100644 --- a/libmproxy/models/http.py +++ b/libmproxy/models/http.py @@ -8,6 +8,7 @@ from libmproxy import utils from netlib import encoding from netlib.http import status_codes, Headers, Request, Response, CONTENT_MISSING from netlib.tcp import Address +from netlib.utils import native from .. import version, stateobject from .flow import Flow @@ -497,6 +498,8 @@ class decoded(object): def __init__(self, o): self.o = o ce = o.headers.get("content-encoding") + if ce: + ce = native(ce, "ascii", "ignore") if ce in encoding.ENCODINGS: self.ce = ce else: @@ -504,7 +507,8 @@ class decoded(object): def __enter__(self): if self.ce: - self.o.decode() + if not self.o.decode(): + self.ce = None def __exit__(self, type, value, tb): if self.ce: |