diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 15:49:40 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 15:49:40 +0000 |
| commit | ac3b2592ae2fa2ec77e4ac82f644220499dd13e9 (patch) | |
| tree | a2a4be682a920de7dc061531a6efe96756b5c321 /net/http | |
| parent | c4063b8d54260a20e8a25daa58ddeb0abbb692d7 (diff) | |
| download | chromium_src-ac3b2592ae2fa2ec77e4ac82f644220499dd13e9.zip chromium_src-ac3b2592ae2fa2ec77e4ac82f644220499dd13e9.tar.gz chromium_src-ac3b2592ae2fa2ec77e4ac82f644220499dd13e9.tar.bz2 | |
Address post-review comments on r56727.
BUG=none
TEST=none
http://codereview.chromium.org/3107030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_stream_request.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc index b3310a8..de7554b 100644 --- a/net/http/http_stream_request.cc +++ b/net/http/http_stream_request.cc @@ -520,8 +520,10 @@ int HttpStreamRequest::DoInitConnection() { if (request_info().load_flags & LOAD_VERIFY_EV_CERT) ssl_config()->verify_ev_cert = true; - if (proxy_info()->proxy_server().scheme() == ProxyServer::SCHEME_HTTP) + if (proxy_info()->proxy_server().scheme() == ProxyServer::SCHEME_HTTP || + proxy_info()->proxy_server().scheme() == ProxyServer::SCHEME_HTTPS) { ssl_config()->mitm_proxies_allowed = true; + } scoped_refptr<SSLSocketParams> ssl_params = new SSLSocketParams(tcp_params, http_proxy_params, socks_params, |