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

Unified Diff: net/http/http_network_transaction.cc

Issue 1850043002: Check whether to enable token binding in preconnect.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ssl_config args from PreconnectStreams and remove privacy mode/token binding duplicate logic Created 4 years, 8 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/http/http_network_transaction.cc
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index ebbe15522507eae7fdbc02d17b8f4209c8e3147e..37c7e9c1364db072efb99dd770a950110ada167a 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -154,6 +154,9 @@ int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info,
net_log_ = net_log;
request_ = request_info;
+ // Now that we have an HttpRequestInfo object, update server_ssl_config_.
+ session_->GetSSLConfig(*request_, &server_ssl_config_);
+
if (request_->load_flags & LOAD_DISABLE_CERT_REVOCATION_CHECKING) {
server_ssl_config_.rev_checking_enabled = false;
proxy_ssl_config_.rev_checking_enabled = false;
@@ -162,14 +165,6 @@ int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info,
if (request_->load_flags & LOAD_PREFETCH)
response_.unused_since_prefetch = true;
- // Channel ID is disabled if privacy mode is enabled for this request.
- if (request_->privacy_mode == PRIVACY_MODE_ENABLED) {
- server_ssl_config_.channel_id_enabled = false;
- } else if (session_->params().enable_token_binding &&
- session_->params().channel_id_service) {
- server_ssl_config_.token_binding_params.push_back(TB_PARAM_ECDSAP256);
- }
-
next_state_ = STATE_NOTIFY_BEFORE_CREATE_STREAM;
int rv = DoLoop(OK);
if (rv == ERR_IO_PENDING)

Powered by Google App Engine
This is Rietveld 408576698