aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-19 11:59:40 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-19 11:59:40 +0200
commit91cdd78201497e89b9a17275a484d461f0143137 (patch)
treef56692a6ca7fb3b12f3aa60e2161899ae1e1d725 /netlib
parent551d9f11e571eac495674f1c23cfd0dfa8af2cb7 (diff)
downloadmitmproxy-91cdd78201497e89b9a17275a484d461f0143137.tar.gz
mitmproxy-91cdd78201497e89b9a17275a484d461f0143137.tar.bz2
mitmproxy-91cdd78201497e89b9a17275a484d461f0143137.zip
improve http error messages
Diffstat (limited to 'netlib')
-rw-r--r--netlib/http/http1/read.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/netlib/http/http1/read.py b/netlib/http/http1/read.py
index 7f2b7bab..c6760ff3 100644
--- a/netlib/http/http1/read.py
+++ b/netlib/http/http1/read.py
@@ -215,9 +215,9 @@ def _get_first_line(rfile):
# Possible leftover from previous message
line = rfile.readline()
except TcpDisconnect:
- raise HttpReadDisconnect()
+ raise HttpReadDisconnect("Remote disconnected")
if not line:
- raise HttpReadDisconnect()
+ raise HttpReadDisconnect("Remote disconnected")
line = line.strip()
try:
line.decode("ascii")
@@ -227,7 +227,11 @@ def _get_first_line(rfile):
def _read_request_line(rfile):
- line = _get_first_line(rfile)
+ try:
+ line = _get_first_line(rfile)
+ except HttpReadDisconnect:
+ # We want to provide a better error message.
+ raise HttpReadDisconnect("Client disconnected")
try:
method, path, http_version = line.split(b" ")
@@ -270,7 +274,11 @@ def _parse_authority_form(hostport):
def _read_response_line(rfile):
- line = _get_first_line(rfile)
+ try:
+ line = _get_first_line(rfile)
+ except HttpReadDisconnect:
+ # We want to provide a better error message.
+ raise HttpReadDisconnect("Server disconnected")
try: