summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
m---------externals/cpp-httplib0
-rw-r--r--src/core/hle/service/sockets/sockets.h1
-rw-r--r--src/core/hle/service/sockets/sockets_translate.cpp2
-rw-r--r--src/core/internal_network/network.cpp4
-rw-r--r--src/core/internal_network/network.h1
-rw-r--r--src/web_service/web_backend.cpp2
-rw-r--r--src/yuzu/discord_impl.cpp2
8 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8896fe0be..10a3de9e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ endif()
if (ENABLE_WEB_SERVICE)
find_package(cpp-jwt 1.4 CONFIG)
- find_package(httplib 0.11 MODULE)
+ find_package(httplib 0.12 MODULE)
endif()
if (YUZU_TESTS)
diff --git a/externals/cpp-httplib b/externals/cpp-httplib
-Subproject 305a7abcb9b4e9e349843c6d563212e6c1bbbf2
+Subproject 6d963fbe8d415399d65e94db7910bbd22fe3741
diff --git a/src/core/hle/service/sockets/sockets.h b/src/core/hle/service/sockets/sockets.h
index 31b7dad33..9840c11f9 100644
--- a/src/core/hle/service/sockets/sockets.h
+++ b/src/core/hle/service/sockets/sockets.h
@@ -23,6 +23,7 @@ enum class Errno : u32 {
INVAL = 22,
MFILE = 24,
MSGSIZE = 90,
+ CONNRESET = 104,
NOTCONN = 107,
TIMEDOUT = 110,
};
diff --git a/src/core/hle/service/sockets/sockets_translate.cpp b/src/core/hle/service/sockets/sockets_translate.cpp
index 023aa0486..594e58f90 100644
--- a/src/core/hle/service/sockets/sockets_translate.cpp
+++ b/src/core/hle/service/sockets/sockets_translate.cpp
@@ -27,6 +27,8 @@ Errno Translate(Network::Errno value) {
return Errno::NOTCONN;
case Network::Errno::TIMEDOUT:
return Errno::TIMEDOUT;
+ case Network::Errno::CONNRESET:
+ return Errno::CONNRESET;
default:
UNIMPLEMENTED_MSG("Unimplemented errno={}", value);
return Errno::SUCCESS;
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp
index 7494fb62d..f85c73ca6 100644
--- a/src/core/internal_network/network.cpp
+++ b/src/core/internal_network/network.cpp
@@ -109,6 +109,8 @@ Errno TranslateNativeError(int e) {
return Errno::AGAIN;
case WSAECONNREFUSED:
return Errno::CONNREFUSED;
+ case WSAECONNRESET:
+ return Errno::CONNRESET;
case WSAEHOSTUNREACH:
return Errno::HOSTUNREACH;
case WSAENETDOWN:
@@ -205,6 +207,8 @@ Errno TranslateNativeError(int e) {
return Errno::AGAIN;
case ECONNREFUSED:
return Errno::CONNREFUSED;
+ case ECONNRESET:
+ return Errno::CONNRESET;
case EHOSTUNREACH:
return Errno::HOSTUNREACH;
case ENETDOWN:
diff --git a/src/core/internal_network/network.h b/src/core/internal_network/network.h
index 36994c22e..1e09a007a 100644
--- a/src/core/internal_network/network.h
+++ b/src/core/internal_network/network.h
@@ -30,6 +30,7 @@ enum class Errno {
NOTCONN,
AGAIN,
CONNREFUSED,
+ CONNRESET,
HOSTUNREACH,
NETDOWN,
NETUNREACH,
diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp
index 12a7e4922..dff380cca 100644
--- a/src/web_service/web_backend.cpp
+++ b/src/web_service/web_backend.cpp
@@ -71,7 +71,7 @@ struct Client::Impl {
const std::string& jwt_ = "", const std::string& username_ = "",
const std::string& token_ = "") {
if (cli == nullptr) {
- cli = std::make_unique<httplib::Client>(host.c_str());
+ cli = std::make_unique<httplib::Client>(host);
}
if (!cli->is_valid()) {
diff --git a/src/yuzu/discord_impl.cpp b/src/yuzu/discord_impl.cpp
index de0c307d4..978ffef33 100644
--- a/src/yuzu/discord_impl.cpp
+++ b/src/yuzu/discord_impl.cpp
@@ -76,7 +76,7 @@ void DiscordImpl::Update() {
// New Check for game cover
httplib::Client cli(game_cover_url);
- if (auto res = cli.Head(fmt::format("/images/game/boxart/{}.png", icon_name).c_str())) {
+ if (auto res = cli.Head(fmt::format("/images/game/boxart/{}.png", icon_name))) {
if (res->status == 200) {
game_cover_url += fmt::format("/images/game/boxart/{}.png", icon_name);
} else {