Merge remote-tracking branch 'upstream/master' into develop

[#113263389] Signed-off-by: John Shahid <jshahid@pivotal.io>
cloudfoundry · Feb 25, 2016 · 6fd264e · 6fd264e
2 parents 13f0c90 + a8cf29a
commit 6fd264e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Node.js Buildpack Changelog
 
-## Pending
+## v88 (2016-2-23)
 
-Retries all curl requests
+- Retries all curl requests
+- Use HTTPS for node binary downloads again
 
 ## v87 (2015-11-03)
 

diff --git a/lib/binaries.sh b/lib/binaries.sh
@@ -20,7 +20,7 @@ install_nodejs() {
   fi
 
   echo "Downloading and installing node $version..."
-  local download_url="http://s3pository.heroku.com/node/v$version/node-v$version-$os-$cpu.tar.gz"
+  local download_url="https://s3pository.heroku.com/node/v$version/node-v$version-$os-$cpu.tar.gz"
   curl "`translate_dependency_url $download_url`" --silent --fail --retry 5 --retry-max-time 15 -o /tmp/node.tar.gz || (>&2 $BP_DIR/compile-extensions/bin/recommend_dependency $download_url && false)
   echo "Downloaded [`translate_dependency_url $download_url`]"
   tar xzf /tmp/node.tar.gz -C /tmp