mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 14:41:18 +08:00
cbf4a66415
closes #38201 supersedes #38237 Lets see if I forgot to cherry pick something. --------- Co-authored-by: Yury Bura <yurybura@gmail.com>
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
src/http/Server.C | 4 ++--
|
|
src/web/FileUtils.C | 1 +
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/http/Server.C b/src/http/Server.C
|
|
index b26a444..200b2ce 100644
|
|
--- a/src/http/Server.C
|
|
+++ b/src/http/Server.C
|
|
@@ -331,8 +331,8 @@ std::vector<asio::ip::address> Server::resolveAddress(asio::ip::tcp::resolver &r
|
|
LOG_DEBUG_S(&wt_, "Failed to resolve hostname \"" << address << "\" as IPv4: " <<
|
|
Wt::AsioWrapper::system_error(errc).what());
|
|
// Resolve IPv6
|
|
- query = Wt::AsioWrapper::asio::ip::tcp::resolver::query(Wt::AsioWrapper::asio::ip::tcp::v6(), address, "http");
|
|
- for (Wt::AsioWrapper::asio::ip::tcp::resolver::iterator it = resolver.resolve(query, errc);
|
|
+ asio::ip::tcp::resolver::query query_v6(asio::ip::tcp::v6(), address, "http");
|
|
+ for (asio::ip::tcp::resolver::iterator it = resolver.resolve(query_v6, errc);
|
|
!errc && it != end; ++it) {
|
|
result.push_back(it->endpoint().address());
|
|
}
|
|
diff --git a/src/web/FileUtils.C b/src/web/FileUtils.C
|
|
index 8d49571..a15f091 100644
|
|
--- a/src/web/FileUtils.C
|
|
+++ b/src/web/FileUtils.C
|
|
@@ -8,6 +8,7 @@
|
|
#include "web/FileUtils.h"
|
|
|
|
#include <boost/filesystem/operations.hpp>
|
|
+#include <boost/filesystem/directory.hpp>
|
|
|
|
#include "web/WebUtils.h"
|
|
#include "Wt/WException.h"
|
|
|