From 5da27a9905302a5e43fdf4db8a7b7b784544bed2 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 19 Feb 2011 17:00:24 +1300 Subject: Refactor Flow primitives to remove HTTP1.0 assumption. This is a big patch removing the assumption that there's one connection per Request/Response pair. It touches pretty much every part of mitmproxy, so expect glitches until everything is ironed out. --- libmproxy/dump.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'libmproxy/dump.py') diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 372e6ef6..f6a7ae7e 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -38,14 +38,6 @@ class DumpMaster(flow.FlowMaster): except IOError, v: raise DumpError(v.strerror) - def handle_clientconnection(self, r): - flow.FlowMaster.handle_clientconnection(self, r) - r.ack() - - def handle_error(self, r): - flow.FlowMaster.handle_error(self, r) - r.ack() - def _runscript(self, f, script): try: ret = f.run_script(script) @@ -80,12 +72,12 @@ class DumpMaster(flow.FlowMaster): return sz = utils.pretty_size(len(f.response.content)) if self.o.verbosity == 1: - print >> self.outfile, f.client_conn.address[0], + print >> self.outfile, f.request.client_conn.address[0], print >> self.outfile, f.request.short() print >> self.outfile, " <<", print >> self.outfile, f.response.short(), sz elif self.o.verbosity == 2: - print >> self.outfile, f.client_conn.address[0], + print >> self.outfile, f.request.client_conn.address[0], print >> self.outfile, f.request.short() print >> self.outfile, self.indent(4, f.request.headers) print >> self.outfile @@ -93,7 +85,7 @@ class DumpMaster(flow.FlowMaster): print >> self.outfile, self.indent(4, f.response.headers) print >> self.outfile, "\n" elif self.o.verbosity == 3: - print >> self.outfile, f.client_conn.address[0], + print >> self.outfile, f.request.client_conn.address[0], print >> self.outfile, f.request.short() print >> self.outfile, self.indent(4, f.request.headers) if utils.isBin(f.request.content): -- cgit v1.2.3