Fixes #905 - Fixes https with proxy when no port defined for server.

s3tools · Aug 12, 2017 · 11d56a9 · 11d56a9
1 parent 21f36f5
commit 11d56a9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/S3/ConnMan.py b/S3/ConnMan.py
@@ -209,8 +209,9 @@ def __init__(self, id, hostname, ssl, cfg):
             if ssl:
                 self.c = http_connection._https_connection(cfg.proxy_host, cfg.proxy_port)
                 debug(u'proxied HTTPSConnection(%s, %s)', cfg.proxy_host, cfg.proxy_port)
-                self.c.set_tunnel(self.hostname, self.port)
-                debug(u'tunnel to %s, %s', self.hostname, self.port)
+                port = self.port and self.port or 443
+                self.c.set_tunnel(self.hostname, port)
+                debug(u'tunnel to %s, %s', self.hostname, port)
             else:
                 self.c = httplib.HTTPConnection(cfg.proxy_host, cfg.proxy_port)
                 debug(u'proxied HTTPConnection(%s, %s)', cfg.proxy_host, cfg.proxy_port)