Skip to content

Remove the address_configured flag on tcp::resolver::query #1145

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 2 commits into from
Jun 13, 2019
Merged

Remove the address_configured flag on tcp::resolver::query #1145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1033adb
Remove the address_configured flag on tcp::resolver::query
robhancocksed May 28, 2019
b71570d
Merge remote-tracking branch 'origin/master' into pr/n1145_master
BillyONeal Jun 13, 2019
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
4 changes: 3 additions & 1 deletion Release/src/http/listener/http_server_asio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,9 @@ void hostport_listener::start()
auto& service = crossplat::threadpool::shared_instance().service();
tcp::resolver resolver(service);
// #446: boost resolver does not recognize "+" as a host wildchar
tcp::resolver::query query = ("+" == m_host) ? tcp::resolver::query(m_port) : tcp::resolver::query(m_host, m_port);
tcp::resolver::query query = ("+" == m_host) ?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to make this same PR!

The following would be shorter if it compiled cleanly everywhere?

-    tcp::resolver::query query = ("+" == m_host) ? tcp::resolver::query(m_port) : tcp::resolver::query(m_host, m_port);
+    tcp::resolver::query query = ("+" == m_host) ? tcp::resolver::query(m_port, {}) : tcp::resolver::query(m_host, m_port, {});

tcp::resolver::query(m_port, boost::asio::ip::resolver_query_base::flags()) :
tcp::resolver::query(m_host, m_port, boost::asio::ip::resolver_query_base::flags());

tcp::endpoint endpoint = *resolver.resolve(query);

Expand Down