net/http/http_network_transaction.cc - Issue 360113004: Add header pointer to BeforeProxyHeadersSentCallback

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_network_transaction.cc

Issue 360113004: Add header pointer to BeforeProxyHeadersSentCallback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comment Created 6 years, 6 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 78f238a9bbd561b26f24f655b45a57680e2b9695..0e278eb19c37cc5af14dc6a381ffbde09aeabd83 100644

--- a/net/http/http_network_transaction.cc

+++ b/net/http/http_network_transaction.cc

@@ -884,10 +884,11 @@ void HttpNetworkTransaction::BuildRequestHeaders(bool using_proxy) {

auth_controllers_[HttpAuth::AUTH_SERVER]->AddAuthorizationHeader(

&request_headers_);

+ request_headers_.MergeFrom(request_->extra_headers);

if (using_proxy && !before_proxy_headers_sent_callback_.is_null())

- before_proxy_headers_sent_callback_.Run(proxy_info_);

+ before_proxy_headers_sent_callback_.Run(proxy_info_, &request_headers_);

- request_headers_.MergeFrom(request_->extra_headers);

response_.did_use_http_auth =

request_headers_.HasHeader(HttpRequestHeaders::kAuthorization) ||

request_headers_.HasHeader(HttpRequestHeaders::kProxyAuthorization);

« no previous file with comments | « no previous file | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »