aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/flow/master.py
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy/flow/master.py')
-rw-r--r--mitmproxy/flow/master.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py
index 65a95e44..0475ef4e 100644
--- a/mitmproxy/flow/master.py
+++ b/mitmproxy/flow/master.py
@@ -234,7 +234,7 @@ class FlowMaster(controller.Master):
pb = self.do_server_playback(f)
if not pb and self.kill_nonreplay:
self.add_log("Killed {}".format(f.request.url), "info")
- f.kill(self)
+ f.reply.kill()
def replay_request(self, f, block=False):
"""
@@ -314,8 +314,7 @@ class FlowMaster(controller.Master):
return
if f not in self.state.flows: # don't add again on replay
self.state.add_flow(f)
- if not f.reply.acked:
- self.process_new_request(f)
+ self.process_new_request(f)
return f
@controller.handler
@@ -331,9 +330,8 @@ class FlowMaster(controller.Master):
@controller.handler
def response(self, f):
self.state.update_flow(f)
- if not f.reply.acked:
- if self.client_playback:
- self.client_playback.clear(f)
+ if self.client_playback:
+ self.client_playback.clear(f)
return f
def handle_intercept(self, f):