commit 8b69b189726365411772d098e504acd90d1606e9
author Julien Nabet <serval2412@yahoo.fr> Mon Jan 09 09:01:41 2023 +0100
committer Xisco Fauli <xiscofauli@libreoffice.org> Tue Jan 10 09:10:49 2023 +0000
tree 48c70498190e3f17e2aecc563d7eca76ef5da6f1
parent 73cd20ec950f631a5ddfb73ee57f49a5ad2beb0a

Fix deprecated Curl elements for update part

Change-Id: Ide008c8a80800b33c8104ec3d697e836fae73827
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145186
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 6410fafc6f4d58062d82f86549303f4ae2eec32a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145224
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

desktop/source/app/updater.cxx

diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 2748373..e2cfcea 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -563,7 +563,7 @@ std::string download_content(const OString& rURL, bool bFile, OUString& rHash)
    curl_easy_setopt(curl.get(), CURLOPT_HTTPHEADER, headerlist);
    curl_easy_setopt(curl.get(), CURLOPT_FOLLOWLOCATION, 1); // follow redirects
    // only allow redirect to http:// and https://
    curl_easy_setopt(curl.get(), CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
    curl_easy_setopt(curl.get(), CURLOPT_REDIR_PROTOCOLS_STR, CURLPROTO_HTTP | CURLPROTO_HTTPS);

    std::string response_body;
    utl::TempFile aTempFile;

extensions/source/update/check/download.cxx

diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 387c1ef..3b76f9c 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -61,7 +61,7 @@ static void openFile( OutData& out )
    curl_easy_getinfo(out.curl, CURLINFO_EFFECTIVE_URL, &effective_url);

    double fDownloadSize;
    curl_easy_getinfo(out.curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fDownloadSize);
    curl_easy_getinfo(out.curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &fDownloadSize);

    OString aURL(effective_url);

@@ -233,7 +233,7 @@ static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aPro
        // enable redirection
        (void)curl_easy_setopt(pCURL, CURLOPT_FOLLOWLOCATION, 1);
        // only allow redirect to http:// and https://
        (void)curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
        (void)curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS_STR, CURLPROTO_HTTP | CURLPROTO_HTTPS);

        // write function
        (void)curl_easy_setopt(pCURL, CURLOPT_WRITEDATA, &out);
@@ -241,7 +241,7 @@ static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aPro

        // progress handler - Condition::check unfortunately is not defined const
        (void)curl_easy_setopt(pCURL, CURLOPT_NOPROGRESS, 0);
        (void)curl_easy_setopt(pCURL, CURLOPT_PROGRESSFUNCTION, &progress_callback);
        (void)curl_easy_setopt(pCURL, CURLOPT_XFERINFOFUNCTION, &progress_callback);
        (void)curl_easy_setopt(pCURL, CURLOPT_PROGRESSDATA, &out);

        // proxy
@@ -275,7 +275,7 @@ static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aPro
            // this sometimes happens, when a user throws away his user data, but has already
            // completed the download of an update.
            double fDownloadSize;
            curl_easy_getinfo( pCURL, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fDownloadSize );
            curl_easy_getinfo( pCURL, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &fDownloadSize );
            if ( -1 == fDownloadSize )
            {
                out.Handler->downloadFinished(out.File);