-
Notifications
You must be signed in to change notification settings - Fork 340
Use "IE Proxy Settings" correctly on Windows in vcpkg. #49
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.
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e489e3c
Unify design, abandon WPAD, manually detects IE Proxy at "tls12-downl…
reitowo 54b412a
Meet @BillyONeal's review
reitowo 39d317c
Formatting
reitowo fd6e051
Python's proxy detection
reitowo e200ad9
Use vcpkg::Optional
reitowo f4987f3
Allow mismatches protocol and address prefix
reitowo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #pragma once | ||
|
|
||
| #include <vcpkg/base/optional.h> | ||
|
|
||
| #include <string> | ||
|
|
||
| /* | ||
| * This is a helper class. It reads IE Proxy settings. | ||
| * For coherence of vcpkg design "using HTTP(S)_PROXY not WPAD", it is a user-friendly design to manually | ||
| * read the IE Proxy settings on Windows, and set the environment variables HTTP(S)_PROXY to the same | ||
| * when starting an external program (like CMake, which file(DOWNLOAD) only accept proxy settings | ||
| * by HTTP(S)_PROXY variables). | ||
| */ | ||
|
|
||
| namespace vcpkg::System | ||
| { | ||
| struct IEProxySetting | ||
| { | ||
| std::wstring server; | ||
| std::wstring bypass; | ||
| }; | ||
|
|
||
| vcpkg::Optional<IEProxySetting> get_windows_ie_proxy_server(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #include <vcpkg/base/system.proxy.h> | ||
|
|
||
| vcpkg::Optional<vcpkg::System::IEProxySetting> vcpkg::System::get_windows_ie_proxy_server() | ||
| { | ||
| #if defined(_WIN32) | ||
| WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ieProxy; | ||
| if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) | ||
| { | ||
| vcpkg::System::IEProxySetting ieProxySetting; | ||
|
|
||
| ieProxySetting.server = ieProxy.lpszProxy; | ||
|
|
||
| if (ieProxy.lpszProxyBypass != nullptr) ieProxySetting.bypass = ieProxy.lpszProxyBypass; | ||
|
|
||
| GlobalFree(ieProxy.lpszProxy); | ||
| GlobalFree(ieProxy.lpszProxyBypass); | ||
| GlobalFree(ieProxy.lpszAutoConfigUrl); | ||
|
|
||
| return ieProxySetting; | ||
| } | ||
| return vcpkg::Optional<vcpkg::System::IEProxySetting>(); | ||
| #else | ||
| return vcpkg::Optional<vcpkg::System::IEProxySetting>(); | ||
| #endif | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.