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

Unified Diff: net/url_request/url_request_http_job.cc

Issue 103803012: Make HSTS headers not clobber preloaded pins. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to comments and fix compilation errors. Created 6 years, 7 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/url_request/url_request_http_job.cc
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index c5c209ce7cb7a1ae9c99c8e66eb83518ffbd9306..e3e84d300f6540accba04233c44217bfee2d6b3f 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -841,14 +841,13 @@ void URLRequestHttpJob::OnStartCompleted(int result) {
NotifySSLCertificateError(info, true);
} else {
// Maybe overridable, maybe not. Ask the delegate to decide.
- TransportSecurityState::DomainState domain_state;
const URLRequestContext* context = request_->context();
- const bool fatal = context->transport_security_state() &&
- context->transport_security_state()->GetDomainState(
+ TransportSecurityState* state = context->transport_security_state();
+ const bool fatal =
+ state &&
+ state->ShouldSSLErrorsBeFatal(
request_info_.url.host(),
- SSLConfigService::IsSNIAvailable(context->ssl_config_service()),
- &domain_state) &&
- domain_state.ShouldSSLErrorsBeFatal();
+ SSLConfigService::IsSNIAvailable(context->ssl_config_service()));
NotifySSLCertificateError(
transaction_->GetResponseInfo()->ssl_info, fatal);
}

Powered by Google App Engine
This is Rietveld 408576698