diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/net/http/http_proxy_client_socket.cc | |
parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
download | qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/net/http/http_proxy_client_socket.cc')
-rw-r--r-- | chromium/net/http/http_proxy_client_socket.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/net/http/http_proxy_client_socket.cc b/chromium/net/http/http_proxy_client_socket.cc index 710f9581d0b..a33223d93c3 100644 --- a/chromium/net/http/http_proxy_client_socket.cc +++ b/chromium/net/http/http_proxy_client_socket.cc @@ -99,7 +99,7 @@ NextProto HttpProxyClientSocket::GetProxyNegotiatedProtocol() const { } const HttpResponseInfo* HttpProxyClientSocket::GetConnectResponseInfo() const { - return response_.headers.get() ? &response_ : NULL; + return response_.headers.get() ? &response_ : nullptr; } int HttpProxyClientSocket::Connect(CompletionOnceCallback callback) { @@ -376,6 +376,10 @@ int HttpProxyClientSocket::DoSendRequest() { HttpRequestHeaders extra_headers; if (auth_->HaveAuth()) auth_->AddAuthorizationHeader(&extra_headers); + // AddAuthorizationHeader() might not have added the header even if + // HaveAuth(). + response_.did_use_http_auth = + extra_headers.HasHeader(HttpRequestHeaders::kProxyAuthorization); if (proxy_delegate_) { HttpRequestHeaders proxy_delegate_headers; |