diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 20:00:49 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 20:00:49 +0000 |
| commit | dc694c3f130f849774acdad09b5e2b8420d0ae9f (patch) | |
| tree | ec2fe082c324e419fe0db917d1d9a611f0dae906 /net/socket_stream | |
| parent | 22c830d776888b5c42110447ae7759f457482571 (diff) | |
| download | chromium_src-dc694c3f130f849774acdad09b5e2b8420d0ae9f.zip chromium_src-dc694c3f130f849774acdad09b5e2b8420d0ae9f.tar.gz chromium_src-dc694c3f130f849774acdad09b5e2b8420d0ae9f.tar.bz2 | |
net: make interstitials fatal for pinned sites
BUG=105582
TEST=net_unittests
Review URL: http://codereview.chromium.org/8727003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream_job.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc index 64386eb..b575109 100644 --- a/net/socket_stream/socket_stream_job.cc +++ b/net/socket_stream/socket_stream_job.cc @@ -27,9 +27,9 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob( SSLConfigService* ssl) { GURL socket_url(url); TransportSecurityState::DomainState domain_state; - if (url.scheme() == "ws" && sts && sts->IsEnabledForHost( + if (url.scheme() == "ws" && sts && sts->GetDomainState( &domain_state, url.host(), SSLConfigService::IsSNIAvailable(ssl)) && - domain_state.mode == TransportSecurityState::DomainState::MODE_STRICT) { + domain_state.ShouldRedirectHTTPToHTTPS()) { url_canon::Replacements<char> replacements; static const char kNewScheme[] = "wss"; replacements.SetScheme(kNewScheme, |