aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSolarisSDK <52369286+SolarisSDK@users.noreply.github.com>2019-07-04 20:18:44 +0300
committerGiacomo Pozzoni <giacomopoz@gmail.com>2019-07-04 19:18:44 +0200
commitebfe5a637efae3a6ba9358185fe785e1567b965e (patch)
tree8a22a6fe92e221162fd9dd5879c644f3cc900d91 /src
parent1557a806104a886672bb421f9c12c0f39989f6b1 (diff)
Local-only mode fix (#23546)
* Local-only mode fix In response to issue #21309 * Full patch also for boost 1.66 and newer
Diffstat (limited to 'src')
-rw-r--r--src/common/Asio/Resolver.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/Asio/Resolver.h b/src/common/Asio/Resolver.h
index f4be8b68e4d..f1b61c2c02d 100644
--- a/src/common/Asio/Resolver.h
+++ b/src/common/Asio/Resolver.h
@@ -31,13 +31,15 @@ namespace Trinity
{
boost::system::error_code ec;
#if BOOST_VERSION >= 106600
- boost::asio::ip::tcp::resolver::results_type results = resolver.resolve(protocol, host, service, ec);
+ boost::asio::ip::resolver_base::flags flagsResolver = boost::asio::ip::resolver_base::all_matching;
+ boost::asio::ip::tcp::resolver::results_type results = resolver.resolve(protocol, host, service, flagsResolver, ec);
if (results.begin() == results.end() || ec)
return {};
return results.begin()->endpoint();
#else
- boost::asio::ip::tcp::resolver::query query(std::move(protocol), std::move(host), std::move(service));
+ boost::asio::ip::resolver_query_base::flags flagsQuery = boost::asio::ip::tcp::resolver::query::all_matching;
+ boost::asio::ip::tcp::resolver::query query(std::move(protocol), std::move(host), std::move(service), flagsQuery);
boost::asio::ip::tcp::resolver::iterator itr = resolver.resolve(query, ec);
boost::asio::ip::tcp::resolver::iterator end;
if (itr == end || ec)