diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-31 04:45:39 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-31 04:45:39 +0100 |
| commit | 2db5f9de26f6ce2c90dfba86576d81fc3ce79924 (patch) | |
| tree | e3b33d74f38941835bcab18a4c4bf7ac1d938456 /libmproxy/proxy.py | |
| parent | 7d96ff00efd80b11ab35f7f1c9c7dd6aff9c9032 (diff) | |
| download | mitmproxy-2db5f9de26f6ce2c90dfba86576d81fc3ce79924.tar.gz mitmproxy-2db5f9de26f6ce2c90dfba86576d81fc3ce79924.tar.bz2 mitmproxy-2db5f9de26f6ce2c90dfba86576d81fc3ce79924.zip | |
bring failing tests back into the double-digit range
Diffstat (limited to 'libmproxy/proxy.py')
| -rw-r--r-- | libmproxy/proxy.py | 9 |
1 files changed, 5 insertions, 4 deletions
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 |