Skip to content

Remove trailing '/' from environment HTTP_PROXY variable fixes #45678 #1690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 2 commits into from
May 28, 2025
+8 −1
Merged

Remove trailing '/' from environment HTTP_PROXY variable fixes #45678 #1690

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ed136d
Remove trailing '/' from environment HTTP_PROXY variable
DewJunkie May 24, 2025
4b6b2b9
Pop off the / before unicode conversion and handle zero length setting.
BillyONeal May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/vcpkg/base/downloads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,14 @@ namespace vcpkg
auto maybe_https_proxy_env = get_environment_variable(EnvironmentVariableHttpsProxy);
if (auto p_https_proxy = maybe_https_proxy_env.get())
{
std::wstring env_proxy_settings = Strings::to_utf16(*p_https_proxy);
StringView p_https_proxy_view = *p_https_proxy;
if (p_https_proxy_view.size() != 0 && p_https_proxy_view.back() == '/')
{
// remove trailing slash
p_https_proxy_view = p_https_proxy_view.substr(0, p_https_proxy_view.size() - 1);
}

std::wstring env_proxy_settings = Strings::to_utf16(p_https_proxy_view);
WINHTTP_PROXY_INFO proxy;
proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
proxy.lpszProxy = env_proxy_settings.data();
Expand Down
Loading