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

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

Issue 578553004: Remove the "snionly" concept from the HSTS preload. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ... Created 6 years, 2 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
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket_stream/socket_stream_job.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1333 return OK; 1333 return OK;
1334 } 1334 }
1335 1335
1336 if (!delegate_) 1336 if (!delegate_)
1337 return result; 1337 return result;
1338 1338
1339 SSLInfo ssl_info; 1339 SSLInfo ssl_info;
1340 ssl_socket->GetSSLInfo(&ssl_info); 1340 ssl_socket->GetSSLInfo(&ssl_info);
1341 1341
1342 TransportSecurityState* state = context_->transport_security_state(); 1342 TransportSecurityState* state = context_->transport_security_state();
1343 const bool fatal = 1343 const bool fatal = state && state->ShouldSSLErrorsBeFatal(url_.host());
1344 state &&
1345 state->ShouldSSLErrorsBeFatal(
1346 url_.host(),
1347 SSLConfigService::IsSNIAvailable(context_->ssl_config_service()));
1348 1344
1349 delegate_->OnSSLCertificateError(this, ssl_info, fatal); 1345 delegate_->OnSSLCertificateError(this, ssl_info, fatal);
1350 return ERR_IO_PENDING; 1346 return ERR_IO_PENDING;
1351 } 1347 }
1352 1348
1353 CookieStore* SocketStream::cookie_store() const { 1349 CookieStore* SocketStream::cookie_store() const {
1354 return cookie_store_.get(); 1350 return cookie_store_.get();
1355 } 1351 }
1356 1352
1357 } // namespace net 1353 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket_stream/socket_stream_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698