diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-09-14 11:30:00 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-09-14 11:30:00 +1200 |
| commit | 81e3a6e8e661b212bf45fb37623556f2793d2184 (patch) | |
| tree | f0fdb3d88bce83263fa91b5a0000093f335d865f /libmproxy/flow.py | |
| parent | 7b74d207f39e642e5029a4855da47314ce224a33 (diff) | |
| download | mitmproxy-81e3a6e8e661b212bf45fb37623556f2793d2184.tar.gz mitmproxy-81e3a6e8e661b212bf45fb37623556f2793d2184.tar.bz2 mitmproxy-81e3a6e8e661b212bf45fb37623556f2793d2184.zip | |
Super-basic outline for web io loop
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 794d4950..5954f6ac 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -596,7 +596,7 @@ class FlowMaster(controller.Master): return True return None - def tick(self, q): + def tick(self, q, timeout): if self.client_playback: e = [ self.client_playback.done(), @@ -605,9 +605,9 @@ class FlowMaster(controller.Master): ] if all(e): self.shutdown() - self.client_playback.tick(self) + self.client_playback.tick(self, timeout) - return controller.Master.tick(self, q) + return controller.Master.tick(self, q, timeout) def duplicate_flow(self, f): return self.load_flow(f.copy()) |