From 5a59fef57fdf2207e1bd5930391b88608ae9c0ec Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 15 Sep 2014 00:59:21 +0200 Subject: [PATCH] fix bugs --- libmproxy/dump.py | 4 +++- libmproxy/platform/windows.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libmproxy/dump.py b/libmproxy/dump.py index d3f817804..0349a3b58 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 5f08a9fcb..ddbbed529 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()