From a57b9cb1da9f1a726c56946422acba25d1771b87 Mon Sep 17 00:00:00 2001 From: "morse%netscape.com" Date: Fri, 6 Apr 2001 00:11:54 +0000 Subject: [PATCH] bug 74858, cookie permissions getting lost, r=valeski, sr=alecf git-svn-id: svn://10.0.0.236/trunk@91521 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/cookie/nsCookies.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mozilla/extensions/cookie/nsCookies.cpp b/mozilla/extensions/cookie/nsCookies.cpp index a8e3c95910d..74c3349ea5a 100644 --- a/mozilla/extensions/cookie/nsCookies.cpp +++ b/mozilla/extensions/cookie/nsCookies.cpp @@ -950,13 +950,16 @@ cookie_SetCookieString(char * curURL, nsIPrompt *aPrompter, const char * setCook // cookie_from_header, host_from_header, path_from_header)); /* use common code to determine if we can set the cookie */ - PRBool permission = Permission_Check(aPrompter, host_from_header, COOKIEPERMISSION, + PRBool permission = PR_TRUE; + if (NS_SUCCEEDED(PERMISSION_Read())) { + permission = Permission_Check(aPrompter, host_from_header, COOKIEPERMISSION, // I believe this is the right place to eventually add the logic to ask // about cookies that have excessive lifetimes, but it shouldn't be done // until generalized per-site preferences are available. //cookie_GetLifetimeAsk(timeToExpire) || cookie_GetWarningPref(), new_string); + } PR_FREEIF(new_string); if (!permission) { PR_FREEIF(path_from_header); @@ -1464,7 +1467,9 @@ COOKIE_Remove } CKutil_StrAllocCopy(hostname, hostnameAfterDot); if (hostname) { - Permission_AddHost(hostname, PR_FALSE, COOKIEPERMISSION, PR_TRUE); + if (NS_SUCCEEDED(PERMISSION_Read())) { + Permission_AddHost(hostname, PR_FALSE, COOKIEPERMISSION, PR_TRUE); + } } } cookie_list->RemoveElementAt(count);