aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-11-10 17:11:36 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-11-10 17:11:36 +0100
commitcece3700df02144dc2bd26a55fe4d6076fd7ea22 (patch)
tree74c99553fd5dee4a0138422d6f968bfbd166a9d7 /libmproxy/flow.py
parent476d7da17c7d22415cbd16b625ba8e443a750f0f (diff)
downloadmitmproxy-cece3700df02144dc2bd26a55fe4d6076fd7ea22.tar.gz
mitmproxy-cece3700df02144dc2bd26a55fe4d6076fd7ea22.tar.bz2
mitmproxy-cece3700df02144dc2bd26a55fe4d6076fd7ea22.zip
fix #402
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index bd35e864..1826af3d 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -192,6 +192,7 @@ class ClientPlaybackState:
"""
if self.flows and not self.current:
n = self.flows.pop(0)
+ n.response = None
n.reply = controller.DummyReply()
self.current = master.handle_request(n)
if not testing and not self.current.response:
@@ -615,7 +616,7 @@ class FlowMaster(controller.Master):
]
if all(e):
self.shutdown()
- self.client_playback.tick(self, timeout)
+ self.client_playback.tick(self)
return controller.Master.tick(self, q, timeout)