diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-02-06 23:05:53 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-02-06 23:05:53 +0100 |
| commit | 66090f9aea01094a42c53c762ae5852b7ee91e86 (patch) | |
| tree | d97954bfe9aa3ab46c6f45f7b2afe0afa1796e12 | |
| parent | ff264eb30925914f71e53ff9d3c54bdf112b14b9 (diff) | |
| download | mitmproxy-66090f9aea01094a42c53c762ae5852b7ee91e86.tar.gz mitmproxy-66090f9aea01094a42c53c762ae5852b7ee91e86.tar.bz2 mitmproxy-66090f9aea01094a42c53c762ae5852b7ee91e86.zip | |
finalize merge
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 431332a4..d2c75523 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ python: - "2.7" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git@tcp_proxy" - - "pip install --upgrade git+https://github.com/mitmproxy/pathod.git@tcp_proxy" + - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git" + - "pip install --upgrade git+https://github.com/mitmproxy/pathod.git" - "pip install -r requirements.txt --use-mirrors" - "pip install -r test/requirements.txt --use-mirrors" # command to run tests, e.g. python setup.py test diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index b650181f..8bd93122 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -350,8 +350,8 @@ class ConnectionHandler: """ # TODO: Implement SSL pass-through handling and change conntype passthrough = [ - "echo.websocket.org", - "174.129.224.73" # echo.websocket.org, transparent mode + # "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" |