diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-09-14 23:47:04 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-09-14 23:47:04 +0200 |
| commit | 2956c144d30558141ec43bec798a424974ffa6f1 (patch) | |
| tree | 297a3a9de73f66f5ad0224e60d7ae7520048d282 /libmproxy/console | |
| parent | 729677cd85cffedec8f481f1b6025f00fb637e13 (diff) | |
| parent | 38a1135ab8f3ab2e97d07fa8e339067c67722e16 (diff) | |
| download | mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.tar.gz mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.tar.bz2 mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/common.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 187a755f..006303a7 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -144,6 +144,8 @@ def raw_format_flow(f, focus, extended, padding): if f["resp_ctype"]: resp.append(fcol(f["resp_ctype"], rc)) resp.append(fcol(f["resp_clen"], rc)) + resp.append(fcol(f["resp_rate"], rc)) + elif f["err_msg"]: resp.append(fcol(SYMBOL_RETURN, "error")) resp.append( @@ -185,11 +187,17 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2): contentdesc = "[content missing]" else: contentdesc = "[no content]" + + delta = f.response.timestamp_end - f.response.timestamp_start + size = len(f.response.content) + f.response.get_header_size() + rate = utils.pretty_size(size / delta) + d.update(dict( resp_code = f.response.code, resp_is_replay = f.response.is_replay(), resp_acked = f.response.reply.acked, - resp_clen = contentdesc + resp_clen = contentdesc, + resp_rate = "{0}/s".format(rate), )) t = f.response.headers["content-type"] if t: |