From c656859bcf8164e6c078e61fa9a95ca9b145004c Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Sat, 2 Dec 2023 12:44:08 +0100 Subject: [PATCH 1/4] fix: remove mod fetching request timeout --- NorthstarDLL/mods/autodownload/moddownloader.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/NorthstarDLL/mods/autodownload/moddownloader.cpp b/NorthstarDLL/mods/autodownload/moddownloader.cpp index 9c1489c65..810200c58 100644 --- a/NorthstarDLL/mods/autodownload/moddownloader.cpp +++ b/NorthstarDLL/mods/autodownload/moddownloader.cpp @@ -132,7 +132,6 @@ void FetchModSync(std::promise>&& p, std::string_view ur CURL* easyhandle; easyhandle = curl_easy_init(); - curl_easy_setopt(easyhandle, CURLOPT_TIMEOUT, 30L); curl_easy_setopt(easyhandle, CURLOPT_URL, url.data()); curl_easy_setopt(easyhandle, CURLOPT_FAILONERROR, 1L); curl_easy_setopt(easyhandle, CURLOPT_WRITEDATA, fp); From fb8ebf665cc97de24f2264d1149ede7a7b40d7e7 Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Sat, 2 Dec 2023 16:30:55 +0100 Subject: [PATCH 2/4] fix: abort request if network connection is dropped --- NorthstarDLL/mods/autodownload/moddownloader.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NorthstarDLL/mods/autodownload/moddownloader.cpp b/NorthstarDLL/mods/autodownload/moddownloader.cpp index 810200c58..87b94d987 100644 --- a/NorthstarDLL/mods/autodownload/moddownloader.cpp +++ b/NorthstarDLL/mods/autodownload/moddownloader.cpp @@ -134,6 +134,11 @@ void FetchModSync(std::promise>&& p, std::string_view ur curl_easy_setopt(easyhandle, CURLOPT_URL, url.data()); curl_easy_setopt(easyhandle, CURLOPT_FAILONERROR, 1L); + + /* abort if slower than 30 bytes/sec during 10 seconds */ + curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_TIME, 10L); + curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_LIMIT, 30L); + curl_easy_setopt(easyhandle, CURLOPT_WRITEDATA, fp); curl_easy_setopt(easyhandle, CURLOPT_WRITEFUNCTION, WriteData); result = curl_easy_perform(easyhandle); From 35e29352992d17bcba6d3d18043043cba08bc78c Mon Sep 17 00:00:00 2001 From: Remy Raes Date: Sat, 2 Dec 2023 16:34:04 +0100 Subject: [PATCH 3/4] style: apply clang format --- NorthstarDLL/mods/autodownload/moddownloader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NorthstarDLL/mods/autodownload/moddownloader.cpp b/NorthstarDLL/mods/autodownload/moddownloader.cpp index 87b94d987..dbb230735 100644 --- a/NorthstarDLL/mods/autodownload/moddownloader.cpp +++ b/NorthstarDLL/mods/autodownload/moddownloader.cpp @@ -134,7 +134,7 @@ void FetchModSync(std::promise>&& p, std::string_view ur curl_easy_setopt(easyhandle, CURLOPT_URL, url.data()); curl_easy_setopt(easyhandle, CURLOPT_FAILONERROR, 1L); - + /* abort if slower than 30 bytes/sec during 10 seconds */ curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_TIME, 10L); curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_LIMIT, 30L); From f8a16719629cf2560cf99474d01c61f4c07ab83f Mon Sep 17 00:00:00 2001 From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> Date: Mon, 18 Dec 2023 15:45:25 +0100 Subject: [PATCH 4/4] style: Adjust comment style --- NorthstarDLL/mods/autodownload/moddownloader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NorthstarDLL/mods/autodownload/moddownloader.cpp b/NorthstarDLL/mods/autodownload/moddownloader.cpp index dbb230735..08393a464 100644 --- a/NorthstarDLL/mods/autodownload/moddownloader.cpp +++ b/NorthstarDLL/mods/autodownload/moddownloader.cpp @@ -135,7 +135,7 @@ void FetchModSync(std::promise>&& p, std::string_view ur curl_easy_setopt(easyhandle, CURLOPT_URL, url.data()); curl_easy_setopt(easyhandle, CURLOPT_FAILONERROR, 1L); - /* abort if slower than 30 bytes/sec during 10 seconds */ + // abort if slower than 30 bytes/sec during 10 seconds curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_TIME, 10L); curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_LIMIT, 30L);