diff --git a/mozilla/browser/app/profile/firefox.js b/mozilla/browser/app/profile/firefox.js
index f6af0808237..e1a26dbbf8f 100644
--- a/mozilla/browser/app/profile/firefox.js
+++ b/mozilla/browser/app/profile/firefox.js
@@ -275,6 +275,7 @@ pref("privacy.item.downloads", true);
pref("privacy.item.cookies", false);
pref("privacy.item.cache", true);
pref("privacy.item.siteprefs", false);
+pref("privacy.item.sessions", true);
pref("privacy.sanitize.sanitizeOnShutdown", false);
pref("privacy.sanitize.promptOnSanitize", true);
diff --git a/mozilla/browser/base/content/sanitize.js b/mozilla/browser/base/content/sanitize.js
index 6eeff4da28b..b0b90e25b2f 100644
--- a/mozilla/browser/base/content/sanitize.js
+++ b/mozilla/browser/base/content/sanitize.js
@@ -181,6 +181,26 @@ Sanitizer.prototype = {
.getService(Components.interfaces.nsIPasswordManager);
return pwmgr.enumerator.hasMoreElements();
}
+ },
+
+ sessions: {
+ clear: function ()
+ {
+ // clear all auth tokens
+ var sdr = Components.classes["@mozilla.org/security/sdr;1"]
+ .getService(Components.interfaces.nsISecretDecoderRing);
+ sdr.logoutAndTeardown();
+
+ // clear plain HTTP auth sessions
+ var authMgr = Components.classes['@mozilla.org/network/http-auth-manager;1']
+ .getService(Components.interfaces.nsIHttpAuthManager);
+ authMgr.clearAll();
+ },
+
+ get canClear()
+ {
+ return true;
+ }
}
}
};
diff --git a/mozilla/browser/base/content/sanitize.xul b/mozilla/browser/base/content/sanitize.xul
index 5d10031f7e5..d48902b4960 100644
--- a/mozilla/browser/base/content/sanitize.xul
+++ b/mozilla/browser/base/content/sanitize.xul
@@ -130,6 +130,7 @@
+
@@ -156,6 +157,9 @@
+
diff --git a/mozilla/browser/components/preferences/sanitize.xul b/mozilla/browser/components/preferences/sanitize.xul
index a2df4e07bee..99b50339263 100644
--- a/mozilla/browser/components/preferences/sanitize.xul
+++ b/mozilla/browser/components/preferences/sanitize.xul
@@ -62,6 +62,7 @@
+
@@ -78,6 +79,7 @@
+
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/sanitize.dtd b/mozilla/browser/locales/en-US/chrome/browser/preferences/sanitize.dtd
index c44ef4bc23d..f5d4035b808 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/preferences/sanitize.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/preferences/sanitize.dtd
@@ -15,6 +15,8 @@
+
+
diff --git a/mozilla/browser/locales/en-US/chrome/browser/sanitize.dtd b/mozilla/browser/locales/en-US/chrome/browser/sanitize.dtd
index 753aac6747d..5e94895b54a 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/sanitize.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/sanitize.dtd
@@ -13,6 +13,8 @@
+
+