diff options
Diffstat (limited to 'libmproxy/console/common.py')
| -rw-r--r-- | libmproxy/console/common.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 0ada3e34..c29ffddc 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -130,7 +130,7 @@ else: SYMBOL_MARK = "[m]" -def raw_format_flow(f, focus, extended, padding): +def raw_format_flow(f, focus, extended): f = dict(f) pile = [] req = [] @@ -160,8 +160,11 @@ def raw_format_flow(f, focus, extended, padding): else: uc = "title" + url = f["req_url"] + if f["req_http_version"] not in ("HTTP/1.0", "HTTP/1.1"): + url += " " + f["req_http_version"] req.append( - urwid.Text([(uc, f["req_url"])]) + urwid.Text([(uc, url)]) ) pile.append(urwid.Columns(req, dividechars=1)) @@ -396,8 +399,7 @@ def ask_save_body(part, master, state, flow): flowcache = utils.LRUCache(800) -def format_flow(f, focus, extended=False, hostheader=False, padding=2, - marked=False): +def format_flow(f, focus, extended=False, hostheader=False, marked=False): d = dict( intercepted = f.intercepted, acked = f.reply.acked, @@ -406,6 +408,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2, req_is_replay = f.request.is_replay, req_method = f.request.method, req_url = f.request.pretty_url if hostheader else f.request.url, + req_http_version = f.request.http_version, err_msg = f.error.msg if f.error else None, resp_code = f.response.status_code if f.response else None, @@ -437,5 +440,5 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2, d["resp_ctype"] = "" return flowcache.get( raw_format_flow, - tuple(sorted(d.items())), focus, extended, padding + tuple(sorted(d.items())), focus, extended ) |