summaryrefslogtreecommitdiff
path: root/chromium/net/http/http_proxy_client_socket.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-31 15:50:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:35:23 +0000
commit7b2ffa587235a47d4094787d72f38102089f402a (patch)
tree30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/net/http/http_proxy_client_socket.cc
parentd94af01c90575348c4e81a418257f254b6f8d225 (diff)
downloadqtwebengine-chromium-7b2ffa587235a47d4094787d72f38102089f402a.tar.gz
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/http/http_proxy_client_socket.cc')
-rw-r--r--chromium/net/http/http_proxy_client_socket.cc15
1 files changed, 0 insertions, 15 deletions
diff --git a/chromium/net/http/http_proxy_client_socket.cc b/chromium/net/http/http_proxy_client_socket.cc
index a33223d93c3..46ff67800a2 100644
--- a/chromium/net/http/http_proxy_client_socket.cc
+++ b/chromium/net/http/http_proxy_client_socket.cc
@@ -39,7 +39,6 @@ HttpProxyClientSocket::HttpProxyClientSocket(
bool using_spdy,
NextProto negotiated_protocol,
ProxyDelegate* proxy_delegate,
- bool is_https_proxy,
const NetworkTrafficAnnotationTag& traffic_annotation)
: io_callback_(base::BindRepeating(&HttpProxyClientSocket::OnIOComplete,
base::Unretained(this))),
@@ -51,7 +50,6 @@ HttpProxyClientSocket::HttpProxyClientSocket(
tunnel_(tunnel),
using_spdy_(using_spdy),
negotiated_protocol_(negotiated_protocol),
- is_https_proxy_(is_https_proxy),
proxy_server_(proxy_server),
proxy_delegate_(proxy_delegate),
traffic_annotation_(traffic_annotation),
@@ -460,19 +458,6 @@ int HttpProxyClientSocket::DoReadHeadersComplete(int result) {
// client is expecting an SSL protected response.
// See http://crbug.com/7338.
- case 302: // Found / Moved Temporarily
- // Attempt to follow redirects from HTTPS proxies, but only if we can
- // sanitize the response. This still allows a rogue HTTPS proxy to
- // redirect an HTTPS site load to a similar-looking site, but no longer
- // allows it to impersonate the site the user requested.
- if (!is_https_proxy_ || !SanitizeProxyRedirect(&response_))
- return ERR_TUNNEL_CONNECTION_FAILED;
-
- http_stream_parser_.reset();
- socket_.reset();
- is_reused_ = false;
- return ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT;
-
case 407: // Proxy Authentication Required
// We need this status code to allow proxy authentication. Our
// authentication code is smart enough to avoid being tricked by an