diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2013-02-24 15:36:15 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2013-02-24 15:36:15 +1300 |
commit | 97e11a219fb2a752d5b726b203874101d7ab651c (patch) | |
tree | c87ee6f48b83f211ea0b53ec38e23859e692d9fe /netlib/http.py | |
parent | c6f9a2d74dc0b2d9185743a02e4c1410983f0c3f (diff) | |
download | mitmproxy-97e11a219fb2a752d5b726b203874101d7ab651c.tar.gz mitmproxy-97e11a219fb2a752d5b726b203874101d7ab651c.tar.bz2 mitmproxy-97e11a219fb2a752d5b726b203874101d7ab651c.zip |
Housekeeping and cleanup, some minor argument name changes.
Diffstat (limited to 'netlib/http.py')
-rw-r--r-- | netlib/http.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/netlib/http.py b/netlib/http.py index 29bcf43d..58993686 100644 --- a/netlib/http.py +++ b/netlib/http.py @@ -9,6 +9,9 @@ class HttpError(Exception): return "HttpError(%s, %s)"%(self.code, self.msg) +class HttpErrorConnClosed(HttpError): pass + + def parse_url(url): """ Returns a (scheme, host, port, path) tuple, or None on error. @@ -73,7 +76,7 @@ def read_chunked(code, fp, limit): while 1: line = fp.readline(128) if line == "": - raise HttpError(code, "Connection closed prematurely") + raise HttpErrorConnClosed(code, "Connection closed prematurely") if line != '\r\n' and line != '\n': try: length = int(line, 16) @@ -95,7 +98,7 @@ def read_chunked(code, fp, limit): while 1: line = fp.readline() if line == "": - raise HttpError(code, "Connection closed prematurely") + raise HttpErrorConnClosed(code, "Connection closed prematurely") if line == '\r\n' or line == '\n': break return content @@ -279,7 +282,7 @@ def read_response(rfile, method, body_size_limit): if line == "\r\n" or line == "\n": # Possible leftover from previous message line = rfile.readline() if not line: - raise HttpError(502, "Server disconnect.") + raise HttpErrorConnClosed(502, "Server disconnect.") parts = line.strip().split(" ", 2) if len(parts) == 2: # handle missing message gracefully parts.append("") |