diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-09-15 12:38:49 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-09-15 12:38:49 +1200 |
| commit | 9f8d2eea64d4611c1e2f7e7043fe6d3ef9a6aa40 (patch) | |
| tree | fba4f09a7591f0613a983b3de5d37b18766e75be | |
| parent | 563078df2473a2a65c1a408e4cb27e79c95b7c87 (diff) | |
| parent | 5a59fef57fdf2207e1bd5930391b88608ae9c0ec (diff) | |
| download | mitmproxy-9f8d2eea64d4611c1e2f7e7043fe6d3ef9a6aa40.tar.gz mitmproxy-9f8d2eea64d4611c1e2f7e7043fe6d3ef9a6aa40.tar.bz2 mitmproxy-9f8d2eea64d4611c1e2f7e7043fe6d3ef9a6aa40.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
| -rw-r--r-- | libmproxy/dump.py | 4 | ||||
| -rw-r--r-- | libmproxy/platform/windows.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py index d3f81780..0349a3b5 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -197,7 +197,9 @@ class DumpMaster(flow.FlowMaster): print >> self.outfile, str_request(f, self.showhost) print >> self.outfile, self.indent(4, f.request.headers) if utils.isBin(f.request.content): - print >> self.outfile, self.indent(4, netlib.utils.hexdump(f.request.content)) + d = netlib.utils.hexdump(f.request.content) + d = "\n".join("%s\t%s %s"%i for i in d) + print >> self.outfile, self.indent(4, d) elif f.request.content: print >> self.outfile, self.indent(4, f.request.content) print >> self.outfile diff --git a/libmproxy/platform/windows.py b/libmproxy/platform/windows.py index 5f08a9fc..ddbbed52 100644 --- a/libmproxy/platform/windows.py +++ b/libmproxy/platform/windows.py @@ -43,6 +43,9 @@ class Resolver(object): addr = pickle.load(self.rfile) if addr is None: raise RuntimeError("Cannot resolve original destination.") + addr = list(addr) + addr[0] = str(addr[0]) + addr = tuple(addr) return addr except (EOFError, socket.error): self._connect() |