From 0269b70b0a1060d1035a0928066dc6fd3b7494b7 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 17 Mar 2024 19:23:40 +0200 Subject: [PATCH] kioslave: send KIO error codes from curl slave where possible Signed-off-by: Ivailo Monev --- kioslave/curl/kio_curl.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kioslave/curl/kio_curl.cpp b/kioslave/curl/kio_curl.cpp index 42311356..a65e49c6 100644 --- a/kioslave/curl/kio_curl.cpp +++ b/kioslave/curl/kio_curl.cpp @@ -367,7 +367,8 @@ void CurlProtocol::stat(const KUrl &url) if (kioerror == KIO::ERR_COULD_NOT_LOGIN) { curlresult = authUrl(url); if (curlresult != CURLE_OK) { - KIO_CURL_ERROR(curlresult); + kioerror = curlToKIOError(curlresult, m_curl); + error(kioerror, url.prettyUrl()); return; } } @@ -449,7 +450,8 @@ void CurlProtocol::listDir(const KUrl &url) if (kioerror == KIO::ERR_COULD_NOT_LOGIN) { curlresult = authUrl(url); if (curlresult != CURLE_OK) { - KIO_CURL_ERROR(curlresult); + kioerror = curlToKIOError(curlresult, m_curl); + error(kioerror, url.prettyUrl()); return; } } @@ -553,7 +555,8 @@ void CurlProtocol::get(const KUrl &url) if (kioerror == KIO::ERR_COULD_NOT_LOGIN) { curlresult = authUrl(url); if (curlresult != CURLE_OK) { - KIO_CURL_ERROR(curlresult); + kioerror = curlToKIOError(curlresult, m_curl); + error(kioerror, url.prettyUrl()); return; } } @@ -847,7 +850,7 @@ CURLcode CurlProtocol::authUrlFromCache(const KUrl &url) kioauthinfo.username = url.userName(); kioauthinfo.password = url.password(); if (checkCachedAuthentication(kioauthinfo)) { - CURLcode curlresult = setupAuth(kioauthinfo.username, kioauthinfo.password); + const CURLcode curlresult = setupAuth(kioauthinfo.username, kioauthinfo.password); if (curlresult != CURLE_OK) { return curlresult; }