From 2efc6914e56b2ad986f998afd99f6f3cf022b2a8 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 2 Oct 2014 19:57:56 +0200 Subject: [PATCH] Revert "[DNT] Enable sending DoNotTrack header by default" This reverts commit 12948cd0a47df6d180a3faf36bbb29e211d27c0b. --- CHANGELOG | 1 + src/lib/network/networkmanager.cpp | 2 +- src/lib/preferences/preferences.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ac59edd4a..5db26252f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ Version 1.8.1 * not yet released + * reverted setting DNT header by default * fixed: autofill not working for some frames * fixed: saving speed dial in case of crash * fixed: building on Mac diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp index a3388ca58..cfb584677 100644 --- a/src/lib/network/networkmanager.cpp +++ b/src/lib/network/networkmanager.cpp @@ -106,7 +106,7 @@ void NetworkManager::loadSettings() << QLatin1String("live.com") << QLatin1String("i0.cz") << QLatin1String("sermepa.es"); settings.beginGroup("Web-Browser-Settings"); - m_doNotTrack = settings.value("DoNotTrack", true).toBool(); + m_doNotTrack = settings.value("DoNotTrack", false).toBool(); m_sendReferer = settings.value("SendReferer", true).toBool(); m_sslv3Sites = settings.value("SSLv3Sites", sslv3Sites).toStringList(); settings.endGroup(); diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index c431fb7ab..ab84de576 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -331,7 +331,7 @@ Preferences::Preferences(BrowserWindow* window, QWidget* parent) ui->deleteHtml5storageOnClose->setChecked(settings.value("deleteHTML5StorageOnClose", false).toBool()); connect(ui->html5storage, SIGNAL(toggled(bool)), this, SLOT(allowHtml5storageChanged(bool))); // Other - ui->doNotTrack->setChecked(settings.value("DoNotTrack", true).toBool()); + ui->doNotTrack->setChecked(settings.value("DoNotTrack", false).toBool()); ui->sendReferer->setChecked(settings.value("SendReferer", true).toBool()); //CSS Style