Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

NetworkManager: Use certificates from bundle only on Windows.

Browse Source 
On other platforms, let's just use system certificates.
This commit is contained in:
nowrep 2013-02-24 10:52:31 +01:00
parent 304f1704d2
commit f32ec93caf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -22,6 +22,7 @@ Version 1.4.0
* disabled by default opacity effect on tab previews - see BUILDING * disabled by default opacity effect on tab previews - see BUILDING
* improved showing navigation toolbar in fullscreen * improved showing navigation toolbar in fullscreen
* moved config directory into ~/.config/qupzilla * moved config directory into ~/.config/qupzilla
* certificates bundle is now only used on windows
* fixed opening browser with url with ampersand (%26) as command line argument * fixed opening browser with url with ampersand (%26) as command line argument
* fixed scrolling to anchor in background tabs * fixed scrolling to anchor in background tabs
* fixed parsing UTF-8 filenames in Content-Disposition header * fixed parsing UTF-8 filenames in Content-Disposition header

6
src/lib/network/networkmanager.cpp
View File

@ -109,7 +109,6 @@ void NetworkManager::loadSettings()
QSslConfiguration config = QSslConfiguration::defaultConfiguration(); QSslConfiguration config = QSslConfiguration::defaultConfiguration();
config.setPeerVerifyMode(QSslSocket::VerifyNone); config.setPeerVerifyMode(QSslSocket::VerifyNone);
QSslConfiguration::setDefaultConfiguration(config); QSslConfiguration::setDefaultConfiguration(config);
#endif
QString certDir = mApp->PROFILEDIR + "certificates"; QString certDir = mApp->PROFILEDIR + "certificates";
QString bundlePath = certDir + "/ca-bundle.crt"; QString bundlePath = certDir + "/ca-bundle.crt";
@ -129,6 +128,9 @@ void NetworkManager::loadSettings()
} }
QSslSocket::setDefaultCaCertificates(QSslCertificate::fromPath(bundlePath)); QSslSocket::setDefaultCaCertificates(QSslCertificate::fromPath(bundlePath));
#else
QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates());
#endif
m_proxyFactory->loadSettings(); m_proxyFactory->loadSettings();
} }
@ -664,7 +666,9 @@ void NetworkManager::loadCertificates()
QSslSocket::setDefaultCaCertificates(m_caCerts + m_localCerts); QSslSocket::setDefaultCaCertificates(m_caCerts + m_localCerts);
#ifdef Q_OS_WIN
new CaBundleUpdater(this, this); new CaBundleUpdater(this, this);
#endif
} }
void NetworkManager::disconnectObjects() void NetworkManager::disconnectObjects()