summaryrefslogtreecommitdiffstats
path: root/net/cookies
diff options
context:
space:
mode:
authorricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-09 02:18:57 +0000
committerricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-09 02:18:57 +0000
commit6757a5b85ed89fa4b4fd248836ec41d9e1b89232 (patch)
treed1f4b5559cd4c812265eef4ccdf63eaefadc5491 /net/cookies
parentbf001734a0ff725dff36b8965d2628bd87179bd5 (diff)
downloadchromium_src-6757a5b85ed89fa4b4fd248836ec41d9e1b89232.zip
chromium_src-6757a5b85ed89fa4b4fd248836ec41d9e1b89232.tar.gz
chromium_src-6757a5b85ed89fa4b4fd248836ec41d9e1b89232.tar.bz2
Cookie Monster has a list of default allowed schemes for cookies to be
used on. Add "ws" and "wss" to that list. This CL adds them even on iOS, where the libnet WebSocket implementation is not used, but this should be harmless. BUG=319104 TEST=net_unittests Review URL: https://codereview.chromium.org/71523003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cookies')
-rw-r--r--net/cookies/cookie_monster.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index b9f78ce..15c7143 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -1668,7 +1668,7 @@ int CookieMonster::TrimDuplicateCookiesForKey(
// Note: file must be the last scheme.
const char* CookieMonster::kDefaultCookieableSchemes[] =
- { "http", "https", "file" };
+ { "http", "https", "ws", "wss", "file" };
const int CookieMonster::kDefaultCookieableSchemesCount =
arraysize(kDefaultCookieableSchemes);