Mercurial Repositories > eric / file diff

--- a/Helpviewer/Network/NetworkAccessManager.py	Wed Aug 17 19:49:44 2011 +0200
+++ b/Helpviewer/Network/NetworkAccessManager.py	Thu Aug 18 12:36:53 2011 +0200
@@ -14,7 +14,7 @@
 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 try:
     from PyQt4.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket, \
-        QSslError
+        QSslError, QSsl
     SSL_AVAILABLE = True
 except ImportError:
     SSL_AVAILABLE = False
@@ -82,6 +82,7 @@
                         caList.append(cert)
             sslCfg = QSslConfiguration.defaultConfiguration()
             sslCfg.setCaCertificates(caList)
+            sslCfg.setProtocol(QSsl.AnyProtocol)
             QSslConfiguration.setDefaultConfiguration(sslCfg)
             
             self.sslErrors.connect(self.__sslErrors)
@@ -252,6 +253,7 @@
                     for cert in caNew:
                         caList.append(cert)
                     sslCfg.setCaCertificates(caList)
+                    sslCfg.setProtocol(QSsl.AnyProtocol)
                     QSslConfiguration.setDefaultConfiguration(sslCfg)
                     reply.setSslConfiguration(sslCfg)