| Index: net/http/http_stream_request.cc
|
| ===================================================================
|
| --- net/http/http_stream_request.cc (revision 65205)
|
| +++ net/http/http_stream_request.cc (working copy)
|
| @@ -508,6 +508,7 @@
|
| ssl_params = GenerateSslParams(proxy_tcp_params, NULL, NULL,
|
| ProxyServer::SCHEME_DIRECT,
|
| proxy_host_port->host(),
|
| + proxy_host_port->port(),
|
| want_spdy_over_npn);
|
| proxy_tcp_params = NULL;
|
| }
|
| @@ -547,6 +548,7 @@
|
| GenerateSslParams(tcp_params, http_proxy_params, socks_params,
|
| proxy_info()->proxy_server().scheme(),
|
| request_info().url.HostNoBrackets(),
|
| + request_info().url.EffectiveIntPort(),
|
| want_spdy_over_npn);
|
| SSLClientSocketPool* ssl_pool = NULL;
|
| if (proxy_info()->is_direct())
|
| @@ -834,6 +836,7 @@
|
| scoped_refptr<SOCKSSocketParams> socks_params,
|
| ProxyServer::Scheme proxy_scheme,
|
| std::string hostname,
|
| + uint16 port,
|
| bool want_spdy_over_npn) {
|
|
|
| if (factory_->IsTLSIntolerantServer(request_info().url)) {
|
| @@ -859,7 +862,7 @@
|
|
|
| scoped_refptr<SSLSocketParams> ssl_params(
|
| new SSLSocketParams(tcp_params, socks_params, http_proxy_params,
|
| - proxy_scheme, hostname,
|
| + proxy_scheme, hostname, port,
|
| *ssl_config(), load_flags,
|
| force_spdy_always_ && force_spdy_over_ssl_,
|
| want_spdy_over_npn));
|
|
|