Merge pull request plotly#325 from kiwiroy/f/sync-chunked-requests

theengineear · theengineear · commit a4a62e31069b · 2015-10-11T19:47:40.000+07:00
sync chunked_requests after chriddyp/chunked_requests#5 merge 62581cf3a1 and address plotly#324
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "submodules/mplexporter"]
 	path = submodules/mplexporter
-	url = git://github.com/mpld3/mplexporter.git
+	url = git@github.com:mpld3/mplexporter.git
 [submodule "submodules/chunked_requests"]
 	path = submodules/chunked_requests
-	url = git://github.com/chriddyp/chunked_requests.git
+	url = git@github.com:chriddyp/chunked_requests.git
diff --git a/plotly/plotly/chunked_requests/chunked_request.py b/plotly/plotly/chunked_requests/chunked_request.py
@@ -1,7 +1,8 @@
 import time
 import six
+import os
 from six.moves import http_client
-
+from six.moves.urllib.parse import urlparse
 
 class Stream:
     def __init__(self, server, port=80, headers={}, url='/'):
@@ -76,7 +77,21 @@ def _connect(self):
         server = self._server
         port = self._port
         headers = self._headers
-        self._conn = http_client.HTTPConnection(server, port)
+
+        ## only doing HTTPConnection, so only use http_proxy
+        proxy = os.environ.get("http_proxy");
+        proxy_server = None
+        proxy_port = None
+        if (proxy != None):
+            p = urlparse(proxy)
+            proxy_server = p.hostname
+            proxy_port = p.port
+
+        if (proxy_server != None and proxy_port != None):
+            self._conn = http_client.HTTPConnection(proxy_server, proxy_port)
+            self._conn.set_tunnel(server, port)
+        else:
+            self._conn = http_client.HTTPConnection(server, port)
 
         self._conn.putrequest('POST', self._url)
         self._conn.putheader('Transfer-Encoding', 'chunked')
diff --git a/submodules/chunked_requests b/submodules/chunked_requests
@@ -1 +1 @@
-Subproject commit 14a6b3fa789ce5ee6c32d80d6ebbba1a6aa689f1
+Subproject commit 62581cf3a1df522e52470a1120ada87f700e153a
