diff options
| author | Rouli <rouli.net@gmail.com> | 2013-01-17 17:33:29 +0200 |
|---|---|---|
| committer | Rouli <rouli.net@gmail.com> | 2013-01-17 17:33:29 +0200 |
| commit | 446f9f0a0fc12159ba663d3b8bdc8f1206a197c7 (patch) | |
| tree | 9cb474c3154fb4146cce41e40e25b4a8e3e57d46 /libmproxy/flow.py | |
| parent | 20fa6a30839500207d7d509fe3b8697dbd22a33e (diff) | |
| parent | 280dd94198931bcd819848a70d68f6f5d9f3270b (diff) | |
| download | mitmproxy-446f9f0a0fc12159ba663d3b8bdc8f1206a197c7.tar.gz mitmproxy-446f9f0a0fc12159ba663d3b8bdc8f1206a197c7.tar.bz2 mitmproxy-446f9f0a0fc12159ba663d3b8bdc8f1206a197c7.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'libmproxy/flow.py')
| -rwxr-xr-x | libmproxy/flow.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 9a6b5527..2c4c5513 100755 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1387,6 +1387,8 @@ class FlowMaster(controller.Master): self.kill_nonreplay = kill def stop_server_playback(self): + if self.server_playback.exit: + self.shutdown() self.server_playback = None def do_server_playback(self, flow): @@ -1420,10 +1422,6 @@ class FlowMaster(controller.Master): self.shutdown() self.client_playback.tick(self) - if self.server_playback: - if self.server_playback.exit and self.server_playback.count() == 0: - self.shutdown() - return controller.Master.tick(self, q) def duplicate_flow(self, f): |