improve http error messages

This commit is contained in:
Maximilian Hils 2015-09-19 11:59:40 +02:00
parent 551d9f11e5
commit 91cdd78201
1 changed files with 12 additions and 4 deletions

View File

@ -215,9 +215,9 @@ def _get_first_line(rfile):
# Possible leftover from previous message # Possible leftover from previous message
line = rfile.readline() line = rfile.readline()
except TcpDisconnect: except TcpDisconnect:
raise HttpReadDisconnect() raise HttpReadDisconnect("Remote disconnected")
if not line: if not line:
raise HttpReadDisconnect() raise HttpReadDisconnect("Remote disconnected")
line = line.strip() line = line.strip()
try: try:
line.decode("ascii") line.decode("ascii")
@ -227,7 +227,11 @@ def _get_first_line(rfile):
def _read_request_line(rfile): def _read_request_line(rfile):
try:
line = _get_first_line(rfile) line = _get_first_line(rfile)
except HttpReadDisconnect:
# We want to provide a better error message.
raise HttpReadDisconnect("Client disconnected")
try: try:
method, path, http_version = line.split(b" ") method, path, http_version = line.split(b" ")
@ -270,7 +274,11 @@ def _parse_authority_form(hostport):
def _read_response_line(rfile): def _read_response_line(rfile):
try:
line = _get_first_line(rfile) line = _get_first_line(rfile)
except HttpReadDisconnect:
# We want to provide a better error message.
raise HttpReadDisconnect("Server disconnected")
try: try: