Merge branch '10.21' into 'master'10.21

add upstream 10.21

See merge request opensource-tracking/FreeFileSync!18

2 files changed, 10 insertions, 9 deletions

diff --git a/libcurl/curl_wrap.h b/libcurl/curl_wrap.h
index dca056fc..40694e71 100644
--- a/libcurl/curl_wrap.h
+++ b/libcurl/curl_wrap.h
@@ -137,10 +137,11 @@ std::wstring formatCurlStatusCode(CURLcode sc)
             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR);
             ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3);
             ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST);
+            ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_QUIC_CONNECT_ERROR);
     }
-    static_assert(CURL_LAST == CURLE_HTTP3 + 1);
+    static_assert(CURL_LAST == CURLE_QUIC_CONNECT_ERROR + 1);
 
-    return replaceCpy<std::wstring>(L"Curl status %x.", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
+    return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc)));
 }
 
 
diff --git a/libcurl/rest.cpp b/libcurl/rest.cpp
index 22583483..0d14dfc2 100644
--- a/libcurl/rest.cpp
+++ b/libcurl/rest.cpp
@@ -125,10 +125,10 @@ HttpSession::Result HttpSession::perform(const std::string& serverRelPath,
     }
 
     if (std::any_of(extraOptions.begin(), extraOptions.end(), [](const CurlOption& o) { return o.option == CURLOPT_WRITEFUNCTION || o.option == CURLOPT_READFUNCTION; }))
-    throw std::logic_error("Contract violation! " + std::string(__FILE__) + ":" + numberTo<std::string>(__LINE__)); //Option already used here!
+    throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__)); //Option already used here!
 
     if (readRequest && std::any_of(extraOptions.begin(), extraOptions.end(), [](const CurlOption& o) { return o.option == CURLOPT_POSTFIELDS; }))
-    throw std::logic_error("Contract violation! " + std::string(__FILE__) + ":" + numberTo<std::string>(__LINE__)); //Contradicting options: CURLOPT_READFUNCTION, CURLOPT_POSTFIELDS
+    throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__)); //Contradicting options: CURLOPT_READFUNCTION, CURLOPT_POSTFIELDS
 
     //---------------------------------------------------
     curl_slist* headers = nullptr; //"libcurl will not copy the entire list so you must keep it!"
@@ -160,15 +160,15 @@ HttpSession::Result HttpSession::perform(const std::string& serverRelPath,
         std::rethrow_exception(userCallbackException); //throw X
     //=======================================================================================================
 
-    long httpStatusCode = 0; //optional
-    /*const CURLcode rc = */ ::curl_easy_getinfo(easyHandle_, CURLINFO_RESPONSE_CODE, &httpStatusCode);
+    long httpStatus = 0; //optional
+    /*const CURLcode rc = */ ::curl_easy_getinfo(easyHandle_, CURLINFO_RESPONSE_CODE, &httpStatus);
 
     if (rcPerf != CURLE_OK)
     {
         std::wstring errorMsg = trimCpy(utfTo<std::wstring>(curlErrorBuf)); //optional
 
-        if (httpStatusCode != 0) //optional
-            errorMsg += (errorMsg.empty() ? L"" : L"\n") + formatHttpStatusCode(httpStatusCode);
+        if (httpStatus != 0) //optional
+            errorMsg += (errorMsg.empty() ? L"" : L"\n") + formatHttpStatus(httpStatus);
 #if 0
         //utfTo<std::wstring>(::curl_easy_strerror(ec)) is uninteresting
         //use CURLINFO_OS_ERRNO ?? https://curl.haxx.se/libcurl/c/CURLINFO_OS_ERRNO.html
@@ -181,5 +181,5 @@ HttpSession::Result HttpSession::perform(const std::string& serverRelPath,
     }
 
     lastSuccessfulUseTime_ = std::chrono::steady_clock::now();
-    return { static_cast<int>(httpStatusCode) /*, contentType ? contentType : ""*/ };
+    return { static_cast<int>(httpStatus) /*, contentType ? contentType : ""*/ };
 }