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

Unified Diff: net/http/http_network_transaction.cc

Issue 1408433006: Support tls-server-end-point channel bindings for HTTP authentication. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Narrower dependencies, update comments, address review comments. Created 4 years, 9 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 41c1acffc4fba2406a6ccc81dfeb583f0520cd83..e5762ff6770c42157f42ab2c06a9225e88a332a0 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -1203,13 +1203,13 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
session_->http_stream_factory()->ProcessAlternativeServices(
session_, response_.headers.get(), HostPortPair::FromURL(request_->url));
+ if (IsSecureRequest())
+ stream_->GetSSLInfo(&response_.ssl_info);
+
int rv = HandleAuthChallenge();
if (rv != OK)
return rv;
- if (IsSecureRequest())
- stream_->GetSSLInfo(&response_.ssl_info);
-
headers_valid_ = true;
return OK;
}
@@ -1665,10 +1665,11 @@ int HttpNetworkTransaction::HandleAuthChallenge() {
return ERR_UNEXPECTED_PROXY_AUTH;
int rv = auth_controllers_[target]->HandleAuthChallenge(
- headers, (request_->load_flags & LOAD_DO_NOT_SEND_AUTH_DATA) != 0, false,
+ headers, response_.ssl_info,
+ (request_->load_flags & LOAD_DO_NOT_SEND_AUTH_DATA) != 0, false,
net_log_);
if (auth_controllers_[target]->HaveAuthHandler())
- pending_auth_target_ = target;
+ pending_auth_target_ = target;
scoped_refptr<AuthChallengeInfo> auth_info =
auth_controllers_[target]->auth_info();

Powered by Google App Engine
This is Rietveld 408576698