diff options
Diffstat (limited to 'mitmproxy/flow/master.py')
| -rw-r--r-- | mitmproxy/flow/master.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py index 80949825..64a242ba 100644 --- a/mitmproxy/flow/master.py +++ b/mitmproxy/flow/master.py @@ -30,14 +30,11 @@ class FlowMaster(controller.Master): if server: self.add_server(server) self.state = state - self.active_flows = set() # type: Set[models.Flow] self.server_playback = None # type: Optional[modules.ServerPlaybackState] self.client_playback = None # type: Optional[modules.ClientPlaybackState] self.kill_nonreplay = False self.stream_large_bodies = None # type: Optional[modules.StreamLargeBodies] - self.refresh_server_playback = False - self.setheaders = modules.SetHeaders() self.replay_ignore_params = False self.replay_ignore_content = None self.replay_ignore_host = False @@ -122,7 +119,7 @@ class FlowMaster(controller.Master): return None response = rflow.response.copy() response.is_replay = True - if self.refresh_server_playback: + if self.options.refresh_server_playback: response.refresh() flow.response = response return True @@ -329,9 +326,6 @@ class FlowMaster(controller.Master): return if f not in self.state.flows: # don't add again on replay self.state.add_flow(f) - self.active_flows.add(f) - if not f.reply.acked: - self.setheaders.run(f) if not f.reply.acked: self.process_new_request(f) return f @@ -348,11 +342,8 @@ class FlowMaster(controller.Master): @controller.handler def response(self, f): - self.active_flows.discard(f) self.state.update_flow(f) if not f.reply.acked: - self.setheaders.run(f) - if not f.reply.acked: if self.client_playback: self.client_playback.clear(f) return f @@ -367,7 +358,7 @@ class FlowMaster(controller.Master): def tcp_open(self, flow): # TODO: This would break mitmproxy currently. # self.state.add_flow(flow) - self.active_flows.add(flow) + pass @controller.handler def tcp_message(self, flow): @@ -382,4 +373,4 @@ class FlowMaster(controller.Master): @controller.handler def tcp_close(self, flow): - self.active_flows.discard(flow) + pass |