diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-13 11:43:55 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-13 11:43:55 +1300 |
| commit | 18d25ec1a10c68f9e61e0416a920ca137b3dba68 (patch) | |
| tree | 24b008a4ebe05dd4c8263dbf082648ac0af09bd8 | |
| parent | 0042687f0da202dd33bb799c7bbc51273c4174fa (diff) | |
| download | mitmproxy-18d25ec1a10c68f9e61e0416a920ca137b3dba68.tar.gz mitmproxy-18d25ec1a10c68f9e61e0416a920ca137b3dba68.tar.bz2 mitmproxy-18d25ec1a10c68f9e61e0416a920ca137b3dba68.zip | |
Fix stickycookie setting, indented view traceback.
| -rw-r--r-- | libmproxy/console.py | 6 | ||||
| -rw-r--r-- | libmproxy/flow.py | 2 | ||||
| -rw-r--r-- | libmproxy/utils.py | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index 5636c180..ed073f8a 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -1256,7 +1256,11 @@ class ConsoleMaster(flow.FlowMaster): ) k = None elif k == "t": - self.prompt("Sticky cookie: ", self.set_stickycookie) + self.prompt( + "Sticky cookie: ", + self.stickycookie_txt, + self.set_stickycookie + ) k = None if k: self.view.keypress(size, k) diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 7444b400..e83bbc41 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -469,8 +469,10 @@ class FlowMaster(controller.Master): if not flt: return "Invalid filter expression." self.stickycookie_state = StickyCookieState(flt) + self.stickycookie_txt = txt else: self.stickycookie_state = None + self.stickycookie_txt = None def start_client_playback(self, flows, exit): """ diff --git a/libmproxy/utils.py b/libmproxy/utils.py index 6568c445..232edcdf 100644 --- a/libmproxy/utils.py +++ b/libmproxy/utils.py @@ -75,6 +75,7 @@ def pretty_xmlish(s): A robust pretty-printer for XML-ish data. Returns a list of lines. """ + s = cleanBin(s) data, offset, indent, prev = [], 0, 0, None for i in re.finditer(TAG, s, re.VERBOSE|re.MULTILINE): start, end = i.span() |