finalize merge

nderkach · Feb 6, 2014 · 66090f9 · 66090f9
1 parent ff264eb
commit 66090f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -350,8 +350,8 @@ def establish_ssl(self, client=False, server=False):
         """
         # 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"