Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finalize merge

This commit is contained in:
Maximilian Hils 2014-02-06 23:05:53 +01:00
parent ff264eb309
commit 66090f9aea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -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

4
libmproxy/proxy.py
View File

@ -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"