diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-21 15:01:19 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-21 15:01:19 +1200 |
| commit | 97f3077082371a078380ec28e1425de3dc2a0021 (patch) | |
| tree | 9bb2e4dfeacec85209174672fee3e78df32dcfaf /netlib/http/http1/read.py | |
| parent | 14fb2eeb1ea734d161e84be3920691591f6531a3 (diff) | |
| parent | 43d796553292a9bbf2c174e31e5e0e39e1068be1 (diff) | |
| download | mitmproxy-97f3077082371a078380ec28e1425de3dc2a0021.tar.gz mitmproxy-97f3077082371a078380ec28e1425de3dc2a0021.tar.bz2 mitmproxy-97f3077082371a078380ec28e1425de3dc2a0021.zip | |
Merge branch 'mhils-multidict'
Diffstat (limited to 'netlib/http/http1/read.py')
| -rw-r--r-- | netlib/http/http1/read.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/http/http1/read.py b/netlib/http/http1/read.py index 6e3a1b93..d30976bd 100644 --- a/netlib/http/http1/read.py +++ b/netlib/http/http1/read.py @@ -316,14 +316,14 @@ def _read_headers(rfile): if not ret: raise HttpSyntaxException("Invalid headers") # continued header - ret[-1][1] = ret[-1][1] + b'\r\n ' + line.strip() + ret[-1] = (ret[-1][0], ret[-1][1] + b'\r\n ' + line.strip()) else: try: name, value = line.split(b":", 1) value = value.strip() if not name: raise ValueError() - ret.append([name, value]) + ret.append((name, value)) except ValueError: raise HttpSyntaxException("Invalid headers") return Headers(ret) |