diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 11:18:00 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 11:18:00 +0200 |
| commit | 87566da3babcc827e9dae0f2e9ab9154c353aa11 (patch) | |
| tree | 148ecc7db70dcec9e86c93486defdd4689339b3e /netlib | |
| parent | 45f2ea33b2fdb67ca89e7eedd860ebe683770497 (diff) | |
| download | mitmproxy-87566da3babcc827e9dae0f2e9ab9154c353aa11.tar.gz mitmproxy-87566da3babcc827e9dae0f2e9ab9154c353aa11.tar.bz2 mitmproxy-87566da3babcc827e9dae0f2e9ab9154c353aa11.zip | |
fix mitmproxy/mitmproxy#784
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/http/http1/read.py | 5 | ||||
| -rw-r--r-- | netlib/utils.py | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/netlib/http/http1/read.py b/netlib/http/http1/read.py index 4c898348..73c7deed 100644 --- a/netlib/http/http1/read.py +++ b/netlib/http/http1/read.py @@ -218,11 +218,6 @@ def _get_first_line(rfile): raise HttpReadDisconnect("Remote disconnected") if not line: raise HttpReadDisconnect("Remote disconnected") - line = line.strip() - try: - line.decode("ascii") - except ValueError: - raise HttpSyntaxException("Non-ascii characters in first line: {}".format(line)) return line.strip() diff --git a/netlib/utils.py b/netlib/utils.py index 6f6d1ea0..8b9548ed 100644 --- a/netlib/utils.py +++ b/netlib/utils.py @@ -237,8 +237,9 @@ def parse_url(url): if isinstance(url, six.binary_type): host = parsed.hostname - # this should not raise a ValueError - decode_parse_result(parsed, "ascii") + # this should not raise a ValueError, + # but we try to be very forgiving here and accept just everything. + # decode_parse_result(parsed, "ascii") else: host = parsed.hostname.encode("idna") parsed = encode_parse_result(parsed, "ascii") |