From 2db5f9de26f6ce2c90dfba86576d81fc3ce79924 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 31 Jan 2014 04:45:39 +0100 Subject: bring failing tests back into the double-digit range --- libmproxy/proxy.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libmproxy/proxy.py') diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index e69bb6da..e3e40c7b 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -172,7 +172,7 @@ class RequestReplayThread(threading.Thread): ) self.channel.ask("response", response) except (ProxyError, http.HttpError, tcp.NetLibError), v: - err = flow.Error(self.flow.request, str(v)) + err = flow.Error(str(v)) self.channel.ask("error", err) """ @@ -291,9 +291,10 @@ class ConnectionHandler: A protocol handler must raise a ConnTypeChanged exception if it detects that this is happening """ # TODO: Implement SSL pass-through handling and change conntype - passthrough = ["echo.websocket.org", - "174.129.224.73" # echo.websocket.org, transparent mode - ] + passthrough = [ + "echo.websocket.org", + "174.129.224.73" # echo.websocket.org, transparent mode + ] if self.server_conn.address.host in passthrough or self.sni in passthrough: self.conntype = "tcp" return -- cgit v1.2.3