Skip to content

Improve http_proxy handling in BingRequest sample #494

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

Improve http_proxy handling in BingRequest sample #494

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4011ba1
Don't use proxy in BingRequest sample if not defined
vadz Jul 7, 2017
58d91e6
Fix length of the proxy URI string in BingRequest sample
vadz Jul 8, 2017
49775fe
Support "auto" in "http_proxy" environment variable
vadz Jul 8, 2017
065d075
Simplify PR #494
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
20 changes: 12 additions & 8 deletions Release/samples/BingRequest/bingrequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,22 @@ web::http::client::http_client_config client_config_for_proxy()
{
web::http::client::http_client_config client_config;
#ifdef _WIN32
wchar_t* pValue;
size_t len;
wchar_t* pValue = nullptr;
std::unique_ptr<wchar_t, void(*)(wchar_t*)> holder(nullptr, [](wchar_t* p) { free(p); });
size_t len = 0;
auto err = _wdupenv_s(&pValue, &len, L"http_proxy");
if (!err) {
std::unique_ptr<wchar_t, void(*)(wchar_t*)> holder(pValue, [](wchar_t* p) { free(p); });
uri proxy_uri(std::wstring(pValue, len));
if (pValue)
holder.reset(pValue);
if (!err && pValue && len) {
std::wstring env_http_proxy_string(pValue, len - 1);
#else
if(const char* env_http_proxy = std::getenv("http_proxy")) {
uri proxy_uri(utility::conversions::to_string_t(env_http_proxy));
std::string env_http_proxy_string(env_http_proxy);
#endif
web::web_proxy proxy(proxy_uri);
client_config.set_proxy(proxy);
if (env_http_proxy_string == U("auto"))
client_config.set_proxy(web::web_proxy::use_auto_discovery);
else
client_config.set_proxy(web::web_proxy(env_http_proxy_string));
}

return client_config;
Expand Down