From 84220a21d19bb11d69b88f5eeb85f52d31ce7745 Mon Sep 17 00:00:00 2001 From: Thomas Boop <52323235+thboop@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:39:21 -0500 Subject: [PATCH] Patch Curl to no longer use -k (#3091) * Update externals.sh * Update externals.sh --- src/Misc/externals.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh index 997d132b4..383221e44 100755 --- a/src/Misc/externals.sh +++ b/src/Misc/externals.sh @@ -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.