diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-18 22:55:51 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-18 22:55:51 +0100 |
| commit | 71c1017575c6cb3468b6849cbe4f6dce5fbfcb44 (patch) | |
| tree | 53e52fcdf9de0f3edb899c76b7aaed782a483f09 /netlib/http.py | |
| parent | 7e4f28e82a963194af2315945de937eb140684dd (diff) | |
| parent | 0f22039bcadd26c2745f609085bcfdbba35b4945 (diff) | |
| download | mitmproxy-71c1017575c6cb3468b6849cbe4f6dce5fbfcb44.tar.gz mitmproxy-71c1017575c6cb3468b6849cbe4f6dce5fbfcb44.tar.bz2 mitmproxy-71c1017575c6cb3468b6849cbe4f6dce5fbfcb44.zip | |
Merge branch 'master' into tcp_proxy
Diffstat (limited to 'netlib/http.py')
| -rw-r--r-- | netlib/http.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/http.py b/netlib/http.py index 454edb3a..51f85627 100644 --- a/netlib/http.py +++ b/netlib/http.py @@ -313,7 +313,7 @@ def read_response(rfile, method, body_size_limit): raise HttpError(502, "Invalid headers.") # Parse response body according to http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-16#section-3.3 - if method == "HEAD" or (code in [204, 304]) or 100 <= code <= 199: + if method in ["HEAD", "CONNECT"] or (code in [204, 304]) or 100 <= code <= 199: content = "" else: content = read_http_body(rfile, headers, body_size_limit, False) |