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

Unified Diff: net/url_request/url_request.cc

Issue 19269012: Don't persist HPKP if PrivacyMode is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address codereview nit and fix compilation error in OFFICIAL_BUILD. Created 7 years, 3 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.cc
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index bf031c8bd72b64d48dc6ed023c994193d2700247..b984fbd88cdda38b6fc724d4f92d935f41da2b14 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -919,20 +919,25 @@ void URLRequest::SetPriority(RequestPriority priority) {
bool URLRequest::GetHSTSRedirect(GURL* redirect_url) const {
const GURL& url = this->url();
- if (!url.SchemeIs("http"))
+ if (redirect_url && !url.SchemeIs("http"))
return false;
TransportSecurityState::DomainState domain_state;
+ bool allow_dynamic_state =
+ !(load_flags_ & LOAD_DO_NOT_SEND_COOKIES) && CanGetCookies(CookieList());
if (context()->transport_security_state() &&
context()->transport_security_state()->GetDomainState(
url.host(),
SSLConfigService::IsSNIAvailable(context()->ssl_config_service()),
+ allow_dynamic_state,
&domain_state) &&
domain_state.ShouldUpgradeToSSL()) {
- url_canon::Replacements<char> replacements;
- const char kNewScheme[] = "https";
- replacements.SetScheme(kNewScheme,
- url_parse::Component(0, strlen(kNewScheme)));
- *redirect_url = url.ReplaceComponents(replacements);
+ if (redirect_url) {
+ url_canon::Replacements<char> replacements;
+ const char kNewScheme[] = "https";
+ replacements.SetScheme(kNewScheme,
+ url_parse::Component(0, strlen(kNewScheme)));
+ *redirect_url = url.ReplaceComponents(replacements);
+ }
return true;
}
return false;

Powered by Google App Engine
This is Rietveld 408576698