Revert "LOK: Allow image upload from WOPI-like host with self-signed cert"
This reverts commit d95ac1c608
.
Change-Id: I4bc104272d4c41efab1a7e5eae78267675c1b32b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167753
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
committed by
Andras Timar
parent
b538729c90
commit
fa4ceeb487
@@ -15,7 +15,6 @@
|
|||||||
#include "webdavresponseparser.hxx"
|
#include "webdavresponseparser.hxx"
|
||||||
|
|
||||||
#include <comphelper/attributelist.hxx>
|
#include <comphelper/attributelist.hxx>
|
||||||
#include <comphelper/lok.hxx>
|
|
||||||
#include <comphelper/scopeguard.hxx>
|
#include <comphelper/scopeguard.hxx>
|
||||||
#include <comphelper/string.hxx>
|
#include <comphelper/string.hxx>
|
||||||
|
|
||||||
@@ -754,14 +753,6 @@ CurlSession::CurlSession(uno::Reference<uno::XComponentContext> xContext,
|
|||||||
rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_FORBID_REUSE, 1L);
|
rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_FORBID_REUSE, 1L);
|
||||||
assert(rc == CURLE_OK);
|
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() {}
|
CurlSession::~CurlSession() {}
|
||||||
|
Reference in New Issue
Block a user