servo: Merge #3971 - Download Cargo over HTTPS. Fix #3582 (from SimonSapin:cargo-https); r=Ms2ger
authorSimon Sapin <simon.sapin@exyr.org>
Thu, 13 Nov 2014 14:24:45 -0700
changeset 335335 f52b5f316b005a12c726565991eefd07f829a392
parent 335334 9aa2ef5d6e1f98d19e842c43d61dc3d1fe930f31
child 335336 3775016f57ba6a87d067fc824392ef9fd8ba7af8
push id86548
push userkwierso@gmail.com
push dateSat, 04 Feb 2017 01:35:21 +0000
treeherdermozilla-inbound@e7b96d015d03 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
servo: Merge #3971 - Download Cargo over HTTPS. Fix #3582 (from SimonSapin: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 Source-Repo: https://github.com/servo/servo Source-Revision: 8cb2b922ef8541aee9207efbacf0c125b61f8aaf
servo/python/servo/bootstrap_commands.py
--- a/servo/python/servo/bootstrap_commands.py
+++ b/servo/python/servo/bootstrap_commands.py
@@ -114,18 +114,17 @@ class MachCommands(CommandBase):
             print("Use |bootstrap_cargo --force| to download again.")
             return
 
         if path.isdir(cargo_dir):
             shutil.rmtree(cargo_dir)
         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)
 
         print("Extracting Cargo nightly...")
         nightly_dir = path.join(cargo_dir,
                                 path.basename(tgz_file).replace(".tar.gz", ""))
         extract(tgz_file, cargo_dir, movedir=nightly_dir)