Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix server replay shutdown

This commit is contained in:
Maximilian Hils 2016-04-09 14:20:08 -07:00
parent d6a5291f36
commit 5c8e7a090e
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mitmproxy/flow.py
View File

@ -802,29 +802,37 @@ class FlowMaster(controller.Master):
rflow = self.server_playback.next_flow(flow) rflow = self.server_playback.next_flow(flow)
if not rflow: if not rflow:
return None return None
response = HTTPResponse.from_state(rflow.response.get_state()) response = rflow.response.copy()
response.is_replay = True response.is_replay = True
if self.refresh_server_playback: if self.refresh_server_playback:
response.refresh() response.refresh()
flow.response = response flow.response = response
if self.server_playback.count() == 0:
self.stop_server_playback()
return True return True
return None return None
def tick(self, q, timeout): def tick(self, q, timeout):
if self.client_playback: if self.client_playback:
e = [ stop = (
self.client_playback.done(), self.client_playback.done() and
self.client_playback.exit,
self.state.active_flow_count() == 0 self.state.active_flow_count() == 0
] )
if all(e): exit = stop and self.client_playback.exit
if stop:
self.stop_client_playback()
if exit:
self.shutdown() self.shutdown()
self.client_playback.tick(self) self.client_playback.tick(self)
if self.client_playback.done():
self.client_playback = None
if self.server_playback:
stop = (
self.server_playback.count() == 0 and
self.state.active_flow_count() == 0
)
exit = stop and self.server_playback.exit
if stop:
self.stop_server_playback()
if exit:
self.shutdown()
return super(FlowMaster, self).tick(q, timeout) return super(FlowMaster, self).tick(q, timeout)
def duplicate_flow(self, f): def duplicate_flow(self, f):
@ -1114,7 +1122,7 @@ def read_flows_from_paths(paths):
flows = [] flows = []
for path in paths: for path in paths:
path = os.path.expanduser(path) path = os.path.expanduser(path)
with file(path, "rb") as f: with open(path, "rb") as f:
flows.extend(FlowReader(f).stream()) flows.extend(FlowReader(f).stream())
except IOError as e: except IOError as e:
raise FlowReadError(e.strerror) raise FlowReadError(e.strerror)