diff options
| author | Jake Drahos <drahos@iastate.edu> | 2015-06-11 20:27:33 -0500 |
|---|---|---|
| committer | Jake Drahos <drahos@iastate.edu> | 2015-06-11 20:27:33 -0500 |
| commit | 2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9 (patch) | |
| tree | db1711fa6758b4f67cb7858bcd3b769dd08e9fe3 /libmproxy/console/common.py | |
| parent | f2d7a6aa57a622ebc0d025391046d81f289b8cb3 (diff) | |
| download | mitmproxy-2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9.tar.gz mitmproxy-2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9.tar.bz2 mitmproxy-2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9.zip | |
Moved marking from flow to console
No longer taints the flow primitive
Diffstat (limited to 'libmproxy/console/common.py')
| -rw-r--r-- | libmproxy/console/common.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index cbf39e6e..90bccfe7 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -378,7 +378,8 @@ def ask_save_body(part, master, state, flow): flowcache = utils.LRUCache(800) -def format_flow(f, focus, extended=False, hostheader=False, padding=2): +def format_flow(f, focus, extended=False, hostheader=False, padding=2, + marked=False): d = dict( intercepted = f.intercepted, acked = f.reply.acked, @@ -391,7 +392,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2): err_msg = f.error.msg if f.error else None, resp_code = f.response.code if f.response else None, - marked = f.marked, + marked = marked, ) if f.response: if f.response.content: |