aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-01-31 03:01:51 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-01-31 03:01:51 +0100
commit7d96ff00efd80b11ab35f7f1c9c7dd6aff9c9032 (patch)
tree28ff60b0d106822ff45803c4af8788d2f9173b7c /libmproxy/protocol
parent30a44cbb41fab51a30e609ba6318e1e8c062f73a (diff)
downloadmitmproxy-7d96ff00efd80b11ab35f7f1c9c7dd6aff9c9032.tar.gz
mitmproxy-7d96ff00efd80b11ab35f7f1c9c7dd6aff9c9032.tar.bz2
mitmproxy-7d96ff00efd80b11ab35f7f1c9c7dd6aff9c9032.zip
remove _flow_map from state, improve logging
Diffstat (limited to 'libmproxy/protocol')
-rw-r--r--libmproxy/protocol/http.py1
-rw-r--r--libmproxy/protocol/tcp.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index fcfc53b8..29cdf446 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -874,6 +874,7 @@ class HTTPFlow(Flow):
c += self.response.replace(pattern, repl, *args, **kwargs)
return c
+
class HttpAuthenticationError(Exception):
def __init__(self, auth_headers=None):
self.auth_headers = auth_headers
diff --git a/libmproxy/protocol/tcp.py b/libmproxy/protocol/tcp.py
index 4441d2f0..406a6f7b 100644
--- a/libmproxy/protocol/tcp.py
+++ b/libmproxy/protocol/tcp.py
@@ -54,6 +54,6 @@ class TCPHandler(ProtocolHandler):
self.c.close = True
break
- self.c.log("%s %s" % (direction, dst_str), ["\r\n" + data])
+ self.c.log("%s %s\r\n%s" % (direction, dst_str,data))
dst.wfile.write(data)
dst.wfile.flush() \ No newline at end of file