diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2012-08-18 00:23:41 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2012-08-18 00:23:41 +1200 |
commit | 1bfe847a84f7e959e0886bf522eaa81ca838f330 (patch) | |
tree | 9cecdd7ecc4e040b56c3fcf9aeca3811eaf6987e | |
parent | 20b270ae9a54cf3a42c22156e41ed91cf4b7a16a (diff) | |
download | mitmproxy-1bfe847a84f7e959e0886bf522eaa81ca838f330.tar.gz mitmproxy-1bfe847a84f7e959e0886bf522eaa81ca838f330.tar.bz2 mitmproxy-1bfe847a84f7e959e0886bf522eaa81ca838f330.zip |
Stop server playback after current playback buffer is exhausted.
-rw-r--r-- | libmproxy/console/__init__.py | 2 | ||||
-rw-r--r-- | libmproxy/console/flowlist.py | 2 | ||||
-rw-r--r-- | libmproxy/flow.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 15de4de9..9327ad2c 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -868,7 +868,7 @@ class ConsoleMaster(flow.FlowMaster): elif k == "S": if not self.server_playback: self.path_prompt( - "Server replay: ", + "Server replay path: ", self.state.last_saveload, self.server_playback_path ) diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py index ffad5134..2b443636 100644 --- a/libmproxy/console/flowlist.py +++ b/libmproxy/console/flowlist.py @@ -146,7 +146,7 @@ class ConnectionItem(common.WWrap): ) else: self.master.path_prompt( - "Server replay: ", + "Server replay path: ", self.state.last_saveload, self.master.server_playback_path ) diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 30928177..674197a4 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1317,6 +1317,8 @@ class FlowMaster(controller.Master): if self.refresh_server_playback: response.refresh() flow.request._ack(response) + if self.server_playback.count() == 0: + self.stop_server_playback() return True return None |