Skip to content

Commit

Permalink
Patch Curl to no longer use -k (#3091)
Browse files Browse the repository at this point in the history
* Update externals.sh

* Update externals.sh
  • Loading branch information
thboop authored Jan 16, 2024
1 parent 8e0cd36 commit 84220a2
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/Misc/externals.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,16 @@ function acquireExternalTool() {
echo "Curl version: $CURL_VERSION"

# curl -f Fail silently (no output at all) on HTTP errors (H)
# -k Allow connections to SSL sites without certs (H)
# -S Show error. With -s, make curl show errors when they occur
# -L Follow redirects (H)
# -o FILE Write to FILE instead of stdout
# --retry 3 Retries transient errors 3 times (timeouts, 5xx)
if [[ "$(printf '%s\n' "7.71.0" "$CURL_VERSION" | sort -V | head -n1)" != "7.71.0" ]]; then
# Curl version is less than or equal to 7.71.0, skipping retry-all-errors flag
curl -fkSL --retry 3 -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
curl -fSL --retry 3 -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
else
# Curl version is greater than 7.71.0, running curl with --retry-all-errors flag
curl -fkSL --retry 3 --retry-all-errors -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
curl -fSL --retry 3 --retry-all-errors -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
fi

# Move the partial file to the download target.
Expand Down

0 comments on commit 84220a2

Please sign in to comment.