From 693a51ef4c6ee2de050aec37fad08a4af8372e9c Mon Sep 17 00:00:00 2001 From: "dwitte@stanford.edu" Date: Thu, 15 Nov 2007 01:31:16 -0800 Subject: [PATCH] Bug 324397 - 'Allow cookies for the original site only' preference should be selected by default. patch by dveditz and dwitte; r=mconnor, a=schrep+mconnor --- browser/app/profile/firefox.js | 2 +- browser/components/preferences/privacy.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 5cd3e74f8570..d4ecef0ecc3a 100644 --- a/browser/app/profile/firefox.js +++ b/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", 0); // cookies enabled +pref("network.cookie.cookieBehavior", 1); // 0-Accept, 1-dontAcceptForeign, 2-dontUse pref("network.cookie.enableForCurrentSessionOnly", false); // l12n and i18n diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js index aaef601c8fc8..19433a5d156b 100644 --- a/browser/components/preferences/privacy.js +++ b/browser/components/preferences/privacy.js @@ -160,7 +160,6 @@ 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 @@ -194,7 +193,7 @@ var gPrivacyPane = { writeAcceptCookies: function () { var checkbox = document.getElementById("acceptCookies"); - return checkbox.checked ? 0 : 2; + return checkbox.checked ? 1 : 2; }, /**