Skip to content

Use system proxy #500

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
merged 5 commits into from
Aug 26, 2017
Merged

Use system proxy #500

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96165e1
since win 8.1 the WINHTTP_ACCESS_TYPE_DEFAULT_PROXY is depricated. Be…
Jul 6, 2017
0206caa
add support for using the proxy settings from IE
Jul 11, 2017
5d138eb
cleanup the changes
Jul 11, 2017
11fd953
intedation
Jul 12, 2017
92f1821
Clean up memory after call to WinHttpGetIEProxyConfigForCurrentUser
ras0219-msft Aug 26, 2017
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
39 changes: 39 additions & 0 deletions Release/src/http/client/http_client_winhttp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
#include "cpprest/http_headers.h"
#include "http_client_impl.h"

#ifndef CPPREST_TARGET_XP
#include <VersionHelpers.h>
#endif

namespace web
{
namespace http
Expand Down Expand Up @@ -374,6 +378,41 @@ class winhttp_client : public _http_client_communicator
{
access_type = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY;
proxy_name = WINHTTP_NO_PROXY_NAME;
#ifndef CPPREST_TARGET_XP
if(IsWindows8Point1OrGreater())
{
access_type = WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY;
}
else
{
struct raii_ie_proxy_config : WINHTTP_CURRENT_USER_IE_PROXY_CONFIG
{
raii_ie_proxy_config()
{
memset(this, 0, sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG));
}

~raii_ie_proxy_config()
{
if (lpszProxy)
::GlobalFree(lpszProxy);
if (lpszProxyBypass)
::GlobalFree(lpszProxyBypass);
if (lpszAutoConfigUrl)
::GlobalFree(lpszAutoConfigUrl);
}
};

raii_ie_proxy_config proxyInfo;
BOOL result = WinHttpGetIEProxyConfigForCurrentUser(&proxyInfo);
if (result && proxyInfo.lpszProxy != nullptr)
{
access_type = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
proxy_str = proxyInfo.lpszProxy;
proxy_name = proxy_str.c_str();
}
}
#endif
}
else
{
Expand Down