diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-03-10 13:36:50 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-03-10 13:36:50 +1300 |
| commit | d3aad7a185cd0bbd611f3ad8de39f4d43913bd23 (patch) | |
| tree | a23d96d37f2101ef8fcc76c48a0f2de0b132fcad /libmproxy/flow.py | |
| parent | e1356dd2b6a0293842d5ba4151ddc49f841f3cf6 (diff) | |
| parent | 041eafba73e911953caaab797eb34bf6f0820e7e (diff) | |
| download | mitmproxy-d3aad7a185cd0bbd611f3ad8de39f4d43913bd23.tar.gz mitmproxy-d3aad7a185cd0bbd611f3ad8de39f4d43913bd23.tar.bz2 mitmproxy-d3aad7a185cd0bbd611f3ad8de39f4d43913bd23.zip | |
Merge remote-tracking branch 'taiste/server-replay-pop'
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index c4bf35a5..e7af996c 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -768,12 +768,12 @@ class ClientPlaybackState: class ServerPlaybackState: - def __init__(self, headers, flows, exit): + def __init__(self, headers, flows, exit, nopop): """ headers: Case-insensitive list of request headers that should be included in request-response matching. """ - self.headers, self.exit = headers, exit + self.headers, self.exit, self.nopop = headers, exit, nopop self.fmap = {} for i in flows: if i.response: @@ -815,7 +815,12 @@ class ServerPlaybackState: l = self.fmap.get(self._hash(request)) if not l: return None - return l.pop(0) + + if self.nopop: + return l[0] + else: + return l.pop(0) + class StickyCookieState: @@ -1251,12 +1256,12 @@ class FlowMaster(controller.Master): def stop_client_playback(self): self.client_playback = None - def start_server_playback(self, flows, kill, headers, exit): + def start_server_playback(self, flows, kill, headers, exit, nopop): """ flows: List of flows. kill: Boolean, should we kill requests not part of the replay? """ - self.server_playback = ServerPlaybackState(headers, flows, exit) + self.server_playback = ServerPlaybackState(headers, flows, exit, nopop) self.kill_nonreplay = kill def stop_server_playback(self): |