aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2014-11-13 14:24:45 -0700
committerbors-servo <metajack+bors@gmail.com>2014-11-13 14:24:45 -0700
commit8cb2b922ef8541aee9207efbacf0c125b61f8aaf (patch)
treed0284ad935cd11e05ca522e04df5cddcadeac54c
parentc713bf472400d79448ba53548884779719bf6459 (diff)
parent1a684f8279b91f8ac17863cf717215e31b156e9d (diff)
downloadservo-8cb2b922ef8541aee9207efbacf0c125b61f8aaf.tar.gz
servo-8cb2b922ef8541aee9207efbacf0c125b61f8aaf.zip
auto merge of #3971 : SimonSapin/servo/cargo-https, r=Ms2ger
Download from https://static-rust-lang-org.s3.amazonaws.com, which apparently does not require SNI? This bypasses the CloudFront CDN and goes to directly to S3. CC @brson
-rw-r--r--python/servo/bootstrap_commands.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py
index 1a1d95adde0..11509e5ede5 100644
--- a/python/servo/bootstrap_commands.py
+++ b/python/servo/bootstrap_commands.py
@@ -119,8 +119,7 @@ class MachCommands(CommandBase):
os.makedirs(cargo_dir)
tgz_file = "cargo-nightly-%s.tar.gz" % host_triple()
- # FIXME(#3582): use https.
- nightly_url = "http://static.rust-lang.org/cargo-dist/%s/%s" % \
+ nightly_url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/%s/%s" % \
(self.cargo_build_id(), tgz_file)
download("Cargo nightly", nightly_url, tgz_file)