diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:33:56 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:33:56 +0000 |
| commit | 8fff20b5a494b253e3aa316e552b39aa31e179ae (patch) | |
| tree | 0d385e197f42c40180881727a9b91abdbfdb3f77 /net | |
| parent | 597c4a760380352b8186b45edb3aea823fc66868 (diff) | |
| download | chromium_src-8fff20b5a494b253e3aa316e552b39aa31e179ae.zip chromium_src-8fff20b5a494b253e3aa316e552b39aa31e179ae.tar.gz chromium_src-8fff20b5a494b253e3aa316e552b39aa31e179ae.tar.bz2 | |
Revert "net: have pinning checks ignore minor certificate errors."
This reverts commit r108918.
BUG=103368
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 425b747..889fba86 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -670,9 +670,8 @@ void URLRequestHttpJob::OnStartCompleted(int result) { // merges into a SPDY connection to www.example.com, and gets a different // certificate. const SSLInfo& ssl_info = transaction_->GetResponseInfo()->ssl_info; - if (ssl_info.is_valid() && - (result == OK || (IsCertificateError(result) && - IsCertStatusMinorError(ssl_info.cert_status))) && + if (result == OK && + ssl_info.is_valid() && ssl_info.is_issued_by_known_root && context_->transport_security_state()) { TransportSecurityState::DomainState domain_state; |