diff options
| author | Rouli <rouli.net@gmail.com> | 2013-02-28 13:28:57 +0200 |
|---|---|---|
| committer | Rouli <rouli.net@gmail.com> | 2013-02-28 13:28:57 +0200 |
| commit | b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924 (patch) | |
| tree | a939022f9bbafea95d1d2e88e141b6cceefebdd2 /libmproxy/console/__init__.py | |
| parent | 35f36481b9f9a8050e0316600be168316b60d05e (diff) | |
| parent | b077189dd5230b6c440a200d867c70c6ce031b66 (diff) | |
| download | mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.tar.gz mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.tar.bz2 mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'libmproxy/console/__init__.py')
| -rw-r--r-- | libmproxy/console/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index d6c7f5a2..a16cc4dc 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -580,7 +580,7 @@ class ConsoleMaster(flow.FlowMaster): self.view_flowlist() - self.server.start_slave(controller.Slave, self.masterq) + self.server.start_slave(controller.Slave, controller.Channel(self.masterq)) if self.options.rfile: ret = self.load_flows(self.options.rfile) @@ -1002,7 +1002,7 @@ class ConsoleMaster(flow.FlowMaster): if self.state.intercept and f.match(self.state.intercept) and not f.request.is_replay(): f.intercept() else: - r._ack() + r.reply() self.sync_list_view() self.refresh_flow(f) @@ -1023,7 +1023,7 @@ class ConsoleMaster(flow.FlowMaster): # Handlers def handle_log(self, l): self.add_event(l.msg) - l._ack() + l.reply() def handle_error(self, r): f = flow.FlowMaster.handle_error(self, r) |