aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/pathoc.py
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-08-09 19:49:36 +0200
committerClemens <cle1000.cb@gmail.com>2016-08-09 19:49:36 +0200
commitb27e456ce2150d638b4eef73703da8a30722d392 (patch)
tree2ba82b15f1bdf22f12b7d97e726dcbd19374e9cf /pathod/pathoc.py
parent78bd99f97c36ba24bbab389350eb8e80ba16738f (diff)
parentdcfa7027aed5a8d4aa80aff67fc299298659fb1b (diff)
downloadmitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.tar.gz
mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.tar.bz2
mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.zip
merge with master
Diffstat (limited to 'pathod/pathoc.py')
-rw-r--r--pathod/pathoc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index c6783878..5831ba3e 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -444,7 +444,7 @@ class Pathoc(tcp.TCPClient):
finally:
if resp:
lg("<< %s %s: %s bytes" % (
- resp.status_code, strutils.bytes_to_escaped_str(resp.reason.encode()), len(resp.content)
+ resp.status_code, strutils.escape_control_characters(resp.reason) if resp.reason else "", len(resp.content)
))
if resp.status_code in self.ignorecodes:
lg.suppress()