Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy

nderkach · Sep 15, 2014 · 9f8d2ee · 9f8d2ee
2 parents 563078d + 5a59fef
commit 9f8d2ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/libmproxy/dump.py b/libmproxy/dump.py
@@ -197,7 +197,9 @@ def _process_flow(self, f):
             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
@@ -43,6 +43,9 @@ def original_addr(self, csock):
                 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()