Browse code

Merge branch 'bug/cf-ssl' into upstream-master

Matt Domsch authored on 2015/01/11 05:19:08
Showing 1 changed files
... ...
@@ -560,9 +560,7 @@ class CloudFront(object):
560 560
         return signature
561 561
 
562 562
     def get_connection(self):
563
-        if self.config.proxy_host != "":
564
-            raise ParameterError("CloudFront commands don't work from behind a HTTP proxy")
565
-        conn = ConnMan.get(self.config.cloudfront_host)
563
+        conn = ConnMan.get(self.config.cloudfront_host, ssl = True)
566 564
         return conn
567 565
 
568 566
     def _fail_wait(self, retries):