From 015b9325079cc871bca5d0cb2a5fc272f52dd478 Mon Sep 17 00:00:00 2001 From: "dwitte%stanford.edu" Date: Mon, 19 Nov 2007 10:15:55 +0000 Subject: [PATCH] backing out the kitchen sink. git-svn-id: svn://10.0.0.236/trunk@239638 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/app/profile/firefox.js | 2 +- mozilla/netwerk/cookie/src/nsCookieService.cpp | 2 -- mozilla/netwerk/test/TestCookie.cpp | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mozilla/browser/app/profile/firefox.js b/mozilla/browser/app/profile/firefox.js index d4ecef0ecc3..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", 1); // 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/netwerk/cookie/src/nsCookieService.cpp b/mozilla/netwerk/cookie/src/nsCookieService.cpp index 4ca5a395dbc..c40891be22a 100644 --- a/mozilla/netwerk/cookie/src/nsCookieService.cpp +++ b/mozilla/netwerk/cookie/src/nsCookieService.cpp @@ -1788,11 +1788,9 @@ nsCookieService::IsForeign(nsIURI *aHostURI, // first ensure we're not dealing with IP addresses; if we are, require an // exact match. we can't avoid this, otherwise the algo below will allow two // IP's such as 128.12.96.5 and 213.12.96.5 to match. -/* if (IsIPAddress(firstHost)) { return !IsInDomain(firstHost, currentHost, PR_FALSE); } -*/ // next, allow a one-subdomain-level "fuzz" in the comparison. first, we need // to find how many subdomain levels each host has; we only do the looser diff --git a/mozilla/netwerk/test/TestCookie.cpp b/mozilla/netwerk/test/TestCookie.cpp index f95ac0ac74d..609faaed735 100644 --- a/mozilla/netwerk/test/TestCookie.cpp +++ b/mozilla/netwerk/test/TestCookie.cpp @@ -511,7 +511,7 @@ main(PRInt32 argc, char *argv[]) allTestsPassed = PrintResult(rv, 9) && allTestsPassed; -/* + // *** foreign cookie tests printf("*** Beginning foreign cookie tests...\n"); @@ -560,7 +560,7 @@ main(PRInt32 argc, char *argv[]) rv[13] = CheckResult(cookie.get(), MUST_BE_NULL); allTestsPassed = PrintResult(rv, 14) && allTestsPassed; -*/ + // *** parser tests printf("*** Beginning parser tests...\n"); @@ -598,7 +598,7 @@ main(PRInt32 argc, char *argv[]) allTestsPassed = PrintResult(rv, 10) && allTestsPassed; -/* + // *** mailnews tests printf("*** Beginning mailnews tests...\n"); @@ -628,7 +628,7 @@ main(PRInt32 argc, char *argv[]) rv[6] = CheckResult(cookie.get(), MUST_BE_NULL); allTestsPassed = PrintResult(rv, 7) && allTestsPassed; -*/ + // *** path ordering tests printf("*** Beginning path ordering tests...\n");