diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2021-05-20 16:10:59 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-06 23:04:18 +0000 |
commit | bbab484dc45ae2391065d07e1f68027bb53e44d9 (patch) | |
tree | 95fe80ea52f8dc0966cb69a078c83eabb729fd56 /src/core/profile_adapter.cpp | |
parent | b1a6adf731828b1f68f51480eeb21dd9e7d3ba1e (diff) |
Remove deprecated useforglobalcertificateverification
It enabled an unrecommended OCSP path on Linux
[ChangeLog] (Q)WebEngineSettings::useForGlobalCertificateVerification
has been removed.
Task-number: QTBUG-91467
Change-Id: I9f5d1ad5e4fcb59abd31e6a133ded7bf8319c811
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit 8f7a386a5228428122813ebea1d7489783b00633)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core/profile_adapter.cpp')
-rw-r--r-- | src/core/profile_adapter.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp index 60f74ff80..7f7b7181e 100644 --- a/src/core/profile_adapter.cpp +++ b/src/core/profile_adapter.cpp @@ -93,9 +93,6 @@ inline QString buildLocationFromStandardPath(const QString &standardPath, const namespace QtWebEngineCore { -// static -QPointer<ProfileAdapter> ProfileAdapter::s_profileForGlobalCertificateVerification; - ProfileAdapter::ProfileAdapter(const QString &storageName): m_name(storageName) , m_offTheRecord(storageName.isEmpty()) @@ -677,38 +674,6 @@ void ProfileAdapter::reinitializeHistoryService() } } -void ProfileAdapter::setUseForGlobalCertificateVerification(bool enable) -{ - if (m_usedForGlobalCertificateVerification == enable) - return; - - m_usedForGlobalCertificateVerification = enable; - if (enable) { - if (s_profileForGlobalCertificateVerification) { - s_profileForGlobalCertificateVerification->m_usedForGlobalCertificateVerification = false; - for (auto *client : qAsConst(s_profileForGlobalCertificateVerification->m_clients)) - client->useForGlobalCertificateVerificationChanged(); - } else { - // OCSP enabled - for (auto adapter : qAsConst(WebEngineContext::current()->m_profileAdapters)) - adapter->m_profile->m_profileIOData->resetNetworkContext(); - } - s_profileForGlobalCertificateVerification = this; - } else { - Q_ASSERT(s_profileForGlobalCertificateVerification); - Q_ASSERT(s_profileForGlobalCertificateVerification == this); - s_profileForGlobalCertificateVerification = nullptr; - // OCSP disabled - for (auto adapter : qAsConst(WebEngineContext::current()->m_profileAdapters)) - adapter->m_profile->m_profileIOData->resetNetworkContext(); - } -} - -bool ProfileAdapter::isUsedForGlobalCertificateVerification() const -{ - return m_usedForGlobalCertificateVerification; -} - QString ProfileAdapter::determineDownloadPath(const QString &downloadDirectory, const QString &suggestedFilename, const time_t &startTime) { QFileInfo suggestedFile(QDir(downloadDirectory).absoluteFilePath(suggestedFilename)); |