WIP

Author: vicroms

azure-pipelines/end-to-end-tests-dir/asset-caching.ps1

@@ -188,26 +188,10 @@ if (-not ($actual -match $expected)) {
 }
 
 # ... also with multiple authoritative URLs
-if ($IsWindows) {
-    Refresh-TestRoot
-    $expected = @(
-    "^Downloading example3\.html, trying https://nonexistent\.example\.com",
-    "Trying https://raw\.githubusercontent\.com/microsoft/vcpkg-tool/1767aaee7b229c609f7ad5cf2f57b6a6cc309fb8/LICENSE\.txt",
-    "Successfully downloaded example3\.html",
-    "$"
-    ) -join "`n"
-
-    $actual = Run-VcpkgAndCaptureOutput @commonArgs x-download "$TestDownloadsRoot/example3.html" --sha512 65077997890f66f6041bb3284bb7b88e27631411ccbc253201ca4e00c4bcc58c0d77edffda4975498797cc10772c7fd68fbeb13cc4ac493a3471a9d49e5b6f24 --url https://nonexistent.example.com --url https://raw.githubusercontent.com/microsoft/vcpkg-tool/1767aaee7b229c609f7ad5cf2f57b6a6cc309fb8/LICENSE.txt
-    Throw-IfFailed
-    if (-not ($actual -match $expected)) {
-        throw "Failure: azurl (no), x-block-origin (no), asset-cache (n/a), download (succeed)"
-    }
-}
-
-# Force curl with --header
 Refresh-TestRoot
 $expected = @(
 "^Downloading example3\.html, trying https://nonexistent\.example\.com",
+"error: curl operation failed with error code 6 \(Couldn't resolve host name\)\. This is a non-transient error, won't retry downloading from https://nonexistent\.example\.com",
 "Trying https://raw\.githubusercontent\.com/microsoft/vcpkg-tool/1767aaee7b229c609f7ad5cf2f57b6a6cc309fb8/LICENSE\.txt"
 "Successfully downloaded example3\.html",
 "$"

include/vcpkg/base/curl.h

@@ -1,15 +1,14 @@
+#pragma once
 
-#ifdef _MSC_VER
-#pragma warning(push)           // Save current warning state
-#pragma warning(disable : 6101) // Disable specific warning (e.g., warning 4996)
-#endif
+#include <vcpkg/base/pragmas.h>
 
+VCPKG_MSVC_WARNING(push)
+// note: disable warning triggered by curl headers
+// ws2tcpip.h(968): warning C6101: Returning uninitialized memory '*Mtu':  A successful path through the function does not set the named _Out_ parameter.
+VCPKG_MSVC_WARNING(disable: 6101)
 #include <curl/curl.h>
 #include <curl/multi.h>
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+VCPKG_MSVC_WARNING(pop)
 
 namespace vcpkg
 {

include/vcpkg/base/message-data.inc.h

@@ -967,6 +967,10 @@ DECLARE_MESSAGE(CurlFailedGeneric,
                 (msg::exit_code, msg::error_msg),
                 "curl is the name of a program, see curl.se.",
                 "curl operation failed with error code {exit_code} ({error_msg}).")
+DECLARE_MESSAGE(CurlFailedGenericNoRetryAddendum,
+                (msg::url),
+                "curl is the name of a program, see curl.se.",
+                "This is a non-transient error, won't retry downloading from {url}.")
 DECLARE_MESSAGE(CurlFailedGenericWithRetry,
                 (msg::exit_code, msg::error_msg, msg::count, msg::value),
                 "curl is the name of a program, see curl.se. {value} is the maximum amount of retries.",

locales/messages.json

@@ -563,6 +563,8 @@
   "_CreationFailed.comment": "An example of {path} is /foo/bar.",
   "CurlFailedGeneric": "curl operation failed with error code {exit_code} ({error_msg}).",
   "_CurlFailedGeneric.comment": "curl is the name of a program, see curl.se. An example of {exit_code} is 127. An example of {error_msg} is File Not Found.",
+  "CurlFailedGenericNoRetryAddendum": "This is a non-transient error, won't retry downloading from {url}.",
+  "_CurlFailedGenericNoRetryAddendum.comment": "curl is the name of a program, see curl.se. An example of {url} is https://github.com/microsoft/vcpkg.",
   "CurlFailedGenericWithRetry": "curl operation failed with error code {exit_code} ({error_msg}) retry {count} of {value}.",
   "_CurlFailedGenericWithRetry.comment": "curl is the name of a program, see curl.se. {value} is the maximum amount of retries. An example of {exit_code} is 127. An example of {error_msg} is File Not Found. An example of {count} is 42.",
   "CurlFailedHttpResponse": "curl operation failed with HTTP response code {exit_code}.",

src/vcpkg/base/downloads.cpp

@@ -621,9 +621,11 @@ namespace vcpkg
                 }
                 else
                 {
-                    context.report_error(msg::format(msgCurlFailedGeneric,
-                                                     msg::exit_code = static_cast<int>(curl_code),
-                                                     msg::error_msg = curl_easy_strerror(curl_code)));
+                    context.report_error(
+                        msg::format(msgCurlFailedGeneric,
+                                    msg::exit_code = static_cast<int>(curl_code),
+                                    msg::error_msg = curl_easy_strerror(curl_code))
+                            .append(msg::format(msgCurlFailedGenericNoRetryAddendum, msg::url = sanitized_url)));
                 }
             }
         } while (should_retry && retries_count < retry_delay.size());
@@ -1126,6 +1128,11 @@ namespace vcpkg
                 context, download_path, display_path, asset_cache_settings, maybe_sha512);
             return true;
         }
+        else
+        {
+            asset_cache_attempt_context.commit();
+            authoritative_attempt_context.commit();
+        }
 
         while (++first_sanitized_url, ++first_raw_url != last_raw_url)
         {