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.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py
index b52e8cb6..80949825 100644
--- a/mitmproxy/flow/master.py
+++ b/mitmproxy/flow/master.py
@@ -37,7 +37,6 @@ class FlowMaster(controller.Master):
self.stream_large_bodies = None # type: Optional[modules.StreamLargeBodies]
self.refresh_server_playback = False
- self.replacehooks = modules.ReplaceHooks()
self.setheaders = modules.SetHeaders()
self.replay_ignore_params = False
self.replay_ignore_content = None
@@ -260,13 +259,16 @@ class FlowMaster(controller.Master):
return "Can't replay live request."
if f.intercepted:
return "Can't replay while intercepting..."
- if f.request.content is None:
+ if f.request.raw_content is None:
return "Can't replay request with missing content..."
if f.request:
f.backup()
f.request.is_replay = True
+
+ # TODO: We should be able to remove this.
if "Content-Length" in f.request.headers:
- f.request.headers["Content-Length"] = str(len(f.request.content))
+ f.request.headers["Content-Length"] = str(len(f.request.raw_content))
+
f.response = None
f.error = None
self.process_new_request(f)
@@ -329,8 +331,6 @@ class FlowMaster(controller.Master):
self.state.add_flow(f)
self.active_flows.add(f)
if not f.reply.acked:
- self.replacehooks.run(f)
- if not f.reply.acked:
self.setheaders.run(f)
if not f.reply.acked:
self.process_new_request(f)
@@ -351,8 +351,6 @@ class FlowMaster(controller.Master):
self.active_flows.discard(f)
self.state.update_flow(f)
if not f.reply.acked:
- self.replacehooks.run(f)
- if not f.reply.acked:
self.setheaders.run(f)
if not f.reply.acked:
if self.client_playback: