diff options
| author | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-07 21:46:26 +0000 |
|---|---|---|
| committer | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-07 21:46:26 +0000 |
| commit | 9e6968d25382556b64afd931d273a80e4f3a44fc (patch) | |
| tree | 87b4db9729b9b8bef5624508241f51374fee76d4 /net/socket_stream/socket_stream_job.cc | |
| parent | ef29fa8f0eff84b1c5c7ecd43d98f59608cd936a (diff) | |
| download | chromium_src-9e6968d25382556b64afd931d273a80e4f3a44fc.zip chromium_src-9e6968d25382556b64afd931d273a80e4f3a44fc.tar.gz chromium_src-9e6968d25382556b64afd931d273a80e4f3a44fc.tar.bz2 | |
Make HSTS headers not clobber preloaded pins.
BUG=329386
TEST=With a fresh profile, ensure that accounts.google.com and twitter.com
have public keys pinned. (Check chrome://net-internals/#hsts.) Then visit
those sites. Close the browser, re-launch it, and check that the pins are
still present in a query in chrome://net-internals/#hsts.
Review URL: https://codereview.chromium.org/103803012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream/socket_stream_job.cc')
| -rw-r--r-- | net/socket_stream/socket_stream_job.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc index 0bd7026..a481b97 100644 --- a/net/socket_stream/socket_stream_job.cc +++ b/net/socket_stream/socket_stream_job.cc @@ -28,10 +28,9 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob( URLRequestContext* context, CookieStore* cookie_store) { GURL socket_url(url); - TransportSecurityState::DomainState domain_state; - if (url.scheme() == "ws" && sts && sts->GetDomainState( - url.host(), SSLConfigService::IsSNIAvailable(ssl), &domain_state) && - domain_state.ShouldUpgradeToSSL()) { + if (url.scheme() == "ws" && sts && + sts->ShouldUpgradeToSSL(url.host(), + SSLConfigService::IsSNIAvailable(ssl))) { url::Replacements<char> replacements; static const char kNewScheme[] = "wss"; replacements.SetScheme(kNewScheme, url::Component(0, strlen(kNewScheme))); |