| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/cookies/cookie_util.h" | 5 #include "net/cookies/cookie_util.h" |
| 6 | 6 |
| 7 #include <cstdio> | 7 #include <cstdio> |
| 8 #include <cstdlib> | 8 #include <cstdlib> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/strings/string_tokenizer.h" | 11 #include "base/strings/string_tokenizer.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "net/base/net_util.h" | 14 #include "net/base/net_util.h" |
| 15 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 15 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| 16 #include "url/gurl.h" | 16 #include "url/gurl.h" |
| 17 | 17 |
| 18 namespace net { | 18 namespace net { |
| 19 namespace cookie_util { | 19 namespace cookie_util { |
| 20 | 20 |
| 21 bool DomainIsHostOnly(const std::string& domain_string) { | 21 bool DomainIsHostOnly(const std::string& domain_string) { |
| 22 return (domain_string.empty() || domain_string[0] != '.'); | 22 return (domain_string.empty() || domain_string[0] != '.'); |
| 23 } | 23 } |
| 24 | 24 |
| 25 std::string GetEffectiveDomain(const std::string& scheme, | 25 std::string GetEffectiveDomain(const std::string& scheme, |
| 26 const std::string& host) { | 26 const std::string& host) { |
| 27 if (scheme == "http" || scheme == "https") { | 27 if (scheme == "http" || scheme == "https" || scheme == "ws" || |
| 28 scheme == "wss") { |
| 28 return registry_controlled_domains::GetDomainAndRegistry( | 29 return registry_controlled_domains::GetDomainAndRegistry( |
| 29 host, | 30 host, |
| 30 registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); | 31 registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); |
| 31 } | 32 } |
| 32 | 33 |
| 33 if (!DomainIsHostOnly(host)) | 34 if (!DomainIsHostOnly(host)) |
| 34 return host.substr(1); | 35 return host.substr(1); |
| 35 return host; | 36 return host; |
| 36 } | 37 } |
| 37 | 38 |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 i != parsed_cookies.end(); ++i) { | 258 i != parsed_cookies.end(); ++i) { |
| 258 if (!buffer.empty()) | 259 if (!buffer.empty()) |
| 259 buffer.append("; "); | 260 buffer.append("; "); |
| 260 buffer.append(i->first.begin(), i->first.end()); | 261 buffer.append(i->first.begin(), i->first.end()); |
| 261 buffer.push_back('='); | 262 buffer.push_back('='); |
| 262 buffer.append(i->second.begin(), i->second.end()); | 263 buffer.append(i->second.begin(), i->second.end()); |
| 263 } | 264 } |
| 264 return buffer; | 265 return buffer; |
| 265 } | 266 } |
| 266 | 267 |
| 267 } // namespace cookie_utils | 268 } // namespace cookie_util |
| 268 } // namespace net | 269 } // namespace net |
| 269 | |
| OLD | NEW |