diff --git a/README.md b/README.md index ea1678d96..f00b86940 100644 --- a/README.md +++ b/README.md @@ -39,10 +39,10 @@ To install QupZilla, run this command: (it may be neccessary to run as root) $ make install -Actual version +Current version ---------------------------------------------------------------------------------------- -Actual released version of QupZilla is 1.0.0-b4, you can download precompiled packages +Current released version of QupZilla is 1.0.0-b4, you can download precompiled packages and source from download section. However, if you want latest revision, just take the latest code snapshot either by downloading a tarball or running: diff --git a/src/adblock/adblocksubscription.cpp b/src/adblock/adblocksubscription.cpp index d7a868406..4271d4f85 100644 --- a/src/adblock/adblocksubscription.cpp +++ b/src/adblock/adblocksubscription.cpp @@ -109,7 +109,7 @@ void AdBlockSubscription::rulesDownloaded() if (response.isEmpty()) return; - QString fileName = mApp->getActiveProfilPath()+"adblocklist.txt"; + QString fileName = mApp->getActiveProfilPath() + "adblocklist.txt"; QFile file(fileName); if (!file.open(QFile::WriteOnly)) { qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "Unable to open adblock file for writing:" << fileName; diff --git a/src/network/networkmanager.cpp b/src/network/networkmanager.cpp index 40196795a..c0a30c360 100644 --- a/src/network/networkmanager.cpp +++ b/src/network/networkmanager.cpp @@ -60,9 +60,15 @@ void NetworkManager::loadSettings() m_doNotTrack = settings.value("DoNotTrack", false).toBool(); settings.endGroup(); +#ifdef Q_WS_WIN + // From doc: + // QSslSocket::VerifyNone ... The connection will still be encrypted, and your socket + // will still send its local certificate to the peer if it's requested. + QSslConfiguration config = QSslConfiguration::defaultConfiguration(); - config.setProtocol(QSsl::AnyProtocol); + config.setPeerVerifyMode(QSslSocket::VerifyNone); QSslConfiguration::setDefaultConfiguration(config); +#endif m_proxyFactory->loadSettings(); }