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

Side by Side Diff: net/socket_stream/socket_stream.cc

Issue 19269012: Don't persist HPKP if PrivacyMode is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed ChromeResourceDispatcherHostDelegate::OnResponseStarted to use URLRequest::GetHSTSRedirect. Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // TODO(ukai): code is similar with http_network_transaction.cc. We should 5 // TODO(ukai): code is similar with http_network_transaction.cc. We should
6 // think about ways to share code, if possible. 6 // think about ways to share code, if possible.
7 7
8 #include "net/socket_stream/socket_stream.h" 8 #include "net/socket_stream/socket_stream.h"
9 9
10 #include <set> 10 #include <set>
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 return OK; 1299 return OK;
1300 } 1300 }
1301 1301
1302 if (!delegate_) 1302 if (!delegate_)
1303 return result; 1303 return result;
1304 1304
1305 SSLInfo ssl_info; 1305 SSLInfo ssl_info;
1306 ssl_socket->GetSSLInfo(&ssl_info); 1306 ssl_socket->GetSSLInfo(&ssl_info);
1307 1307
1308 TransportSecurityState::DomainState domain_state; 1308 TransportSecurityState::DomainState domain_state;
1309 const bool fatal = context_->transport_security_state() && 1309 const bool fatal =
1310 context_->transport_security_state()->GetDomainState(url_.host(), 1310 context_->transport_security_state() &&
1311 context_->transport_security_state()->GetDomainState(
1312 url_.host(),
1311 SSLConfigService::IsSNIAvailable(context_->ssl_config_service()), 1313 SSLConfigService::IsSNIAvailable(context_->ssl_config_service()),
1314 delegate_->CanGetCookies(this, url_),
palmer 2013/07/29 21:44:49 This stops requests from *using* dynamic state in
Ryan Sleevi 2013/08/06 22:32:11 Are we sure that "url_" is correct here? When loo
mef 2013/08/09 17:04:05 Hmm, the rewrite in WebSocketJob::GetURLForCookies
Ryan Sleevi 2013/08/09 17:42:30 That's what doesn't make sense - why rewrite the U
1312 &domain_state) && 1315 &domain_state) &&
1313 domain_state.ShouldSSLErrorsBeFatal(); 1316 domain_state.ShouldSSLErrorsBeFatal();
1314 1317
1315 delegate_->OnSSLCertificateError(this, ssl_info, fatal); 1318 delegate_->OnSSLCertificateError(this, ssl_info, fatal);
1316 return ERR_IO_PENDING; 1319 return ERR_IO_PENDING;
1317 } 1320 }
1318 1321
1319 } // namespace net 1322 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698