core.git: Branch 'distro/collabora/co-22.05' - ucb/source

[Thorsten Behrens (via logerrit)]

 ucb/source/ucp/webdav-curl/CurlSession.cxx |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit 5606e86fc333ef90e8da08e8cdb34f1256690586
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Thu May 16 17:52:41 2024 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun May 19 13:57:36 2024 +0200

    backport curl_easy_setopt changes
    
    This reverts commit d95ac1c608caba9cabaa503f1a5589285547aed5.
    
    Change-Id: I4bc104272d4c41efab1a7e5eae78267675c1b32b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167753
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx 
b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index 25c1bdf6faaa..f33bd4e1c6bb 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -15,7 +15,6 @@
 #include "webdavresponseparser.hxx"
 
 #include <comphelper/attributelist.hxx>
-#include <comphelper/lok.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/string.hxx>
 
@@ -719,14 +718,6 @@ 
CurlSession::CurlSession(uno::Reference<uno::XComponentContext> const& xContext,
         rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_FORBID_REUSE, 1L);
         assert(rc == CURLE_OK);
     }
-    // If WOPI-like host has self-signed certificate, it's not possible to 
insert images
-    // to the document, so here is a compromise. The user has already accepted 
the self
-    // signed certificate in the browser, when we get here.
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_SSL_VERIFYPEER, 0L);
-        assert(rc == CURLE_OK);
-    }
 }
 
 CurlSession::~CurlSession() {}