summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 12:52:50 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 12:52:50 +0000
commit0fe211bedec143d5a4222a8eee259a7f97d64dc3 (patch)
tree4f74deeedbe1226000321767b0287b0d8e55f2fc
parentdabb0d1ddd62548ad899caf16ea4ac9a0f68593f (diff)
downloadchromium_src-0fe211bedec143d5a4222a8eee259a7f97d64dc3.zip
chromium_src-0fe211bedec143d5a4222a8eee259a7f97d64dc3.tar.gz
chromium_src-0fe211bedec143d5a4222a8eee259a7f97d64dc3.tar.bz2
Return net::OK, rather than net::OK_FOR_SESSION_ONLY, in
ChromeCookiePolicy::CanGetCookies(). Cookie-getting code paths don't know (or care) about session-only status for a domain; return that special value for only the cookie-setting code path. Patch from Todd Vierling <tv@duh.org> BUG=57677 TEST=User-facing example using facebook.com is in the bug description Review URL: http://codereview.chromium.org/3576009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61504 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/net/chrome_cookie_policy.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/net/chrome_cookie_policy.cc b/chrome/browser/net/chrome_cookie_policy.cc
index da700e3..28c7e95 100644
--- a/chrome/browser/net/chrome_cookie_policy.cc
+++ b/chrome/browser/net/chrome_cookie_policy.cc
@@ -40,6 +40,8 @@ int ChromeCookiePolicy::CanGetCookies(const GURL& url,
}
int policy = CheckPolicy(url);
+ if (policy == net::OK_FOR_SESSION_ONLY)
+ policy = net::OK;
if (policy != net::ERR_IO_PENDING)
return policy;