From a496d32a6897faddedf69be033e2f9ce3ffc3160 Mon Sep 17 00:00:00 2001 From: "dwitte%stanford.edu" Date: Thu, 15 Nov 2007 11:24:21 +0000 Subject: [PATCH] backing out due to tinderbox orange. git-svn-id: svn://10.0.0.236/trunk@239450 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/app/profile/firefox.js | 2 +- mozilla/browser/components/preferences/privacy.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/browser/app/profile/firefox.js b/mozilla/browser/app/profile/firefox.js index ce7ec69b7c1..5cd3e74f857 100644 --- a/mozilla/browser/app/profile/firefox.js +++ b/mozilla/browser/app/profile/firefox.js @@ -340,7 +340,7 @@ pref("privacy.sanitize.promptOnSanitize", true); pref("network.proxy.share_proxy_settings", false); // use the same proxy settings for all protocols -pref("network.cookie.cookieBehavior", 2); // 0-Accept, 1-dontAcceptForeign, 2-dontUse +pref("network.cookie.cookieBehavior", 0); // cookies enabled pref("network.cookie.enableForCurrentSessionOnly", false); // l12n and i18n diff --git a/mozilla/browser/components/preferences/privacy.js b/mozilla/browser/components/preferences/privacy.js index 19433a5d156..aaef601c8fc 100644 --- a/mozilla/browser/components/preferences/privacy.js +++ b/mozilla/browser/components/preferences/privacy.js @@ -160,6 +160,7 @@ var gPrivacyPane = { * 1 means allow cookies from the "originating" server only; see * netwerk/cookie/src/nsCookieService.cpp for a hairier definition * 2 means disable all cookies + * 3 means use P3P policy to decide, which is probably broken * network.cookie.lifetimePolicy * - determines how long cookies are stored: * 0 means keep cookies until they expire @@ -193,7 +194,7 @@ var gPrivacyPane = { writeAcceptCookies: function () { var checkbox = document.getElementById("acceptCookies"); - return checkbox.checked ? 1 : 2; + return checkbox.checked ? 0 : 2; }, /**