Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: net/base/cookie_monster.cc

Issue 6804032: Add TLS-SRP (RFC 5054) support Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: use system srp and mpi libs, not local copies Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/cookie_monster.cc
diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc
index e24b6be5ca6457954e49e35d30646613f729cd5a..94763b97adee2fc29a847338017b1b0ce4975f4a 100644
--- a/net/base/cookie_monster.cc
+++ b/net/base/cookie_monster.cc
@@ -163,7 +163,7 @@ struct CookieSignature {
// (minus any leading period).
std::string GetEffectiveDomain(const std::string& scheme,
const std::string& host) {
- if (scheme == "http" || scheme == "https")
+ if (scheme == "http" || scheme == "https" || scheme == "httpsv")
return RegistryControlledDomainService::GetDomainAndRegistry(host);
if (!CookieMonster::DomainIsHostOnly(host))
@@ -981,8 +981,9 @@ int CookieMonster::TrimDuplicateCookiesForKey(
void CookieMonster::SetDefaultCookieableSchemes() {
// Note: file must be the last scheme.
- static const char* kDefaultCookieableSchemes[] = { "http", "https", "file" };
- int num_schemes = enable_file_scheme_ ? 3 : 2;
+ static const char* kDefaultCookieableSchemes[] =
+ { "http", "https", "httpsv", "file" };
+ int num_schemes = enable_file_scheme_ ? 4 : 3;
SetCookieableSchemes(kDefaultCookieableSchemes, num_schemes);
}

Powered by Google App Engine
This is Rietveld 408576698