aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-06-28 09:57:33 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-06-28 09:57:33 +1200
commitbae86480d49eac9d776872bdcf92c0c42aaff24f (patch)
tree9c1464e91de790696336158e1d48d6707d229305 /netlib/http.py
parent92c7d38bd343a0436d73c0a984fe111996e15059 (diff)
parenta1491a6ae037b7874dd71de11f5cd43e10aa46e7 (diff)
downloadmitmproxy-bae86480d49eac9d776872bdcf92c0c42aaff24f.tar.gz
mitmproxy-bae86480d49eac9d776872bdcf92c0c42aaff24f.tar.bz2
mitmproxy-bae86480d49eac9d776872bdcf92c0c42aaff24f.zip
Merge branch 'master' of github.com:cortesi/netlib
Diffstat (limited to 'netlib/http.py')
-rw-r--r--netlib/http.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/netlib/http.py b/netlib/http.py
index 150995dd..9c72c601 100644
--- a/netlib/http.py
+++ b/netlib/http.py
@@ -248,6 +248,9 @@ def read_http_body_response(rfile, headers, all, limit):
def read_response(rfile, method, body_size_limit):
+ """
+ Return an (httpversion, code, msg, headers, content) tuple.
+ """
line = rfile.readline()
if line == "\r\n" or line == "\n": # Possible leftover from previous message
line = rfile.readline()