diff options
author | Christian Kamm <mail@ckamm.de> | 2019-01-15 13:18:24 +0300 |
---|---|---|
committer | Christian Kamm <mail@ckamm.de> | 2019-01-15 13:18:24 +0300 |
commit | 421c0b447e4012750c5ecb006d20ebd8cc0c0ea1 (patch) | |
tree | 32b865ad91b45664a960c7811d495398eff21c7d /src/gui/owncloudsetupwizard.cpp | |
parent | e87660ba28c95fe2462d58f901b8d2492521c57d (diff) | |
parent | 6627d8139d81dd4e3b74e8f41fcf4a5d06ab87a7 (diff) |
Merge remote-tracking branch 'origin/2.5'
Diffstat (limited to 'src/gui/owncloudsetupwizard.cpp')
-rw-r--r-- | src/gui/owncloudsetupwizard.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index ae58ccd5e..0cd4612fd 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -136,11 +136,23 @@ void OwncloudSetupWizard::slotCheckServer(const QString &urlString) } AccountPtr account = _ocWizard->account(); account->setUrl(url); + // Reset the proxy which might had been determined previously in ConnectionValidator::checkServerAndAuth() // when there was a previous account. account->networkAccessManager()->setProxy(QNetworkProxy(QNetworkProxy::NoProxy)); + // And also reset the QSslConfiguration, for the same reason (#6832) - account->setSslConfiguration({}); + // Here the client certificate is added, if any. Later it'll be in HttpCredentials + account->setSslConfiguration(QSslConfiguration()); + auto sslConfiguration = account->getOrCreateSslConfig(); // let Account set defaults + if (!_ocWizard->_clientSslCertificate.isNull()) { + sslConfiguration.setLocalCertificate(_ocWizard->_clientSslCertificate); + sslConfiguration.setPrivateKey(_ocWizard->_clientSslKey); + } + account->setSslConfiguration(sslConfiguration); + + // Make sure TCP connections get re-established + account->networkAccessManager()->clearAccessCache(); // Lookup system proxy in a thread https://github.com/owncloud/client/issues/2993 if (ClientProxy::isUsingSystemDefault()) { |