From 617be1b01d7ddfed4f36be45db53965e13be9cc0 Mon Sep 17 00:00:00 2001 From: AL Date: Tue, 26 Jun 2018 17:13:56 +0800 Subject: Use WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY instead of WINHTTP_ACCESS_TYPE_DEFAULT_PROXY when Windows 8.1 and newer (#3785) --- toolsrc/src/vcpkg/base/downloads.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'toolsrc') diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index a5ee05391..d23e6194b 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -4,6 +4,8 @@ #include #include +#include + namespace vcpkg::Downloads { #if defined(_WIN32) @@ -29,7 +31,9 @@ namespace vcpkg::Downloads std::to_string(err)); auto hSession = WinHttpOpen( - L"vcpkg/1.0", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); + L"vcpkg/1.0", + IsWindows8Point1OrGreater() ? WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY : WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, + WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); Checks::check_exit(VCPKG_LINE_INFO, hSession, "WinHttpOpen() failed: %d", GetLastError()); // Use Windows 10 defaults on Windows 7 -- cgit v1.2.3