From 237128bfc5b6b024aaecaa5c994f0db4ba94e038 Mon Sep 17 00:00:00 2001 From: Fire <17692105+FireMario211@users.noreply.github.com> Date: Fri, 27 Oct 2023 20:49:17 +0000 Subject: [PATCH] Allow error responses i dont want a "HTTP response code said error" --- loader/src/utils/web.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/loader/src/utils/web.cpp b/loader/src/utils/web.cpp index 8dccd048..04759dee 100644 --- a/loader/src/utils/web.cpp +++ b/loader/src/utils/web.cpp @@ -271,7 +271,7 @@ SentAsyncWebRequest::Impl::Impl(SentAsyncWebRequest* self, AsyncWebRequest const // Follow redirects curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); // Fail if response code is 4XX or 5XX - curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 0L); // we will handle http errors manually // Headers end curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); @@ -307,12 +307,17 @@ SentAsyncWebRequest::Impl::Impl(SentAsyncWebRequest* self, AsyncWebRequest const ); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &data); auto res = curl_easy_perform(curl); + long code = 0; + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); if (res != CURLE_OK) { - long code = 0; - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); curl_easy_cleanup(curl); return this->error("Fetch failed: " + std::string(curl_easy_strerror(res)), code); } + if (code >= 400 && code < 600) { + std::string response_str(ret.begin(), ret.end()); + curl_easy_cleanup(curl); + return this->error(response_str, code); + } curl_easy_cleanup(curl); AWAIT_RESUME();