diff options
| author | Rouli <rouli.net@gmail.com> | 2013-02-28 13:28:57 +0200 |
|---|---|---|
| committer | Rouli <rouli.net@gmail.com> | 2013-02-28 13:28:57 +0200 |
| commit | b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924 (patch) | |
| tree | a939022f9bbafea95d1d2e88e141b6cceefebdd2 /libmproxy/console/common.py | |
| parent | 35f36481b9f9a8050e0316600be168316b60d05e (diff) | |
| parent | b077189dd5230b6c440a200d867c70c6ce031b66 (diff) | |
| download | mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.tar.gz mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.tar.bz2 mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'libmproxy/console/common.py')
| -rw-r--r-- | libmproxy/console/common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 2da7f802..1cc0b5b9 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -184,7 +184,7 @@ def format_flow(f, focus, extended=False, padding=2): req_timestamp = f.request.timestamp_start, req_is_replay = f.request.is_replay(), req_method = f.request.method, - req_acked = f.request.acked, + req_acked = f.request.reply.acked, req_url = f.request.get_url(), err_msg = f.error.msg if f.error else None, @@ -200,7 +200,7 @@ def format_flow(f, focus, extended=False, padding=2): d.update(dict( resp_code = f.response.code, resp_is_replay = f.response.is_replay(), - resp_acked = f.response.acked, + resp_acked = f.response.reply.acked, resp_clen = contentdesc )) t = f.response.headers["content-type"] |