[Pkg-owncloud-commits] [owncloud-client] 230/498: SslConfig: Reset when QNAM is reset. #3394

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit bf183f425dbc5e964438d1d9da535c519f05cba5
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Thu Jul 2 11:28:40 2015 +0200

    SslConfig: Reset when QNAM is reset. #3394
    
    It seems running a CheckServerJob with the existing ssl config after
    resetting QNAM will produce a ssl config without a cert chain.
---
 src/gui/accountstate.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index 4bf8ecd..57c658d 100644
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -158,6 +158,10 @@ void AccountState::checkConnectivity()
         // As an attempted workaround, reset the QNAM regularly if the account is
         // disconnected.
         account()->resetNetworkAccessManager();
+
+        // If we don't reset the ssl config a second CheckServerJob can produce a
+        // ssl config that does not have a sensible certificate chain.
+        account()->setSslConfiguration(QSslConfiguration());
 #endif
         conValidator->checkServerAndAuth();
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git