aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-07-25 18:47:48 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-07-25 18:47:48 +0200
commit4382829b7d9fde4358e12f7c9f195c7d7c854ff1 (patch)
tree2b605ec52ca3cd0ba3c6122d86ff0a808f51dd2f /libmproxy/console
parenta1fa34e61c4414898fd489c40d543ffe638c3d22 (diff)
downloadmitmproxy-4382829b7d9fde4358e12f7c9f195c7d7c854ff1.tar.gz
mitmproxy-4382829b7d9fde4358e12f7c9f195c7d7c854ff1.tar.bz2
mitmproxy-4382829b7d9fde4358e12f7c9f195c7d7c854ff1.zip
workaround: always make sure that flow.response.reply exists
Diffstat (limited to 'libmproxy/console')
-rw-r--r--libmproxy/console/common.py2
-rw-r--r--libmproxy/console/flowview.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index c59d52a0..a8440f79 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -197,7 +197,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2):
d.update(dict(
resp_code = f.response.code,
resp_is_replay = f.response.is_replay,
- resp_acked = hasattr(f.response, "reply") and f.response.reply.acked,
+ resp_acked = f.response.reply.acked,
resp_clen = contentdesc,
resp_rate = "{0}/s".format(rate),
))
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index ac10e809..4aaf8944 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -153,7 +153,7 @@ class FlowView(common.WWrap):
def cont_view_handle_missing(self, conn, viewmode):
if conn.content == CONTENT_MISSING:
- msg, body = "", [urwid.Text([("error", "[content missing]")])], 0
+ msg, body = "", [urwid.Text([("error", "[content missing]")])]
else:
msg, body = self.content_view(viewmode, conn)