diff options
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_stream_request.cc | 5 | ||||
| -rw-r--r-- | net/http/http_stream_request.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc index 35b2145..59a7e8c 100644 --- a/net/http/http_stream_request.cc +++ b/net/http/http_stream_request.cc @@ -513,6 +513,7 @@ int HttpStreamRequest::DoInitConnection() { // Set ssl_params, and unset proxy_tcp_params ssl_params = GenerateSslParams(proxy_tcp_params, NULL, NULL, ProxyServer::SCHEME_DIRECT, + proxy_host_port->host(), want_spdy_over_npn); proxy_tcp_params = NULL; } @@ -549,6 +550,7 @@ int HttpStreamRequest::DoInitConnection() { scoped_refptr<SSLSocketParams> ssl_params = GenerateSslParams(tcp_params, http_proxy_params, socks_params, proxy_info()->proxy_server().scheme(), + request_info().url.HostNoBrackets(), want_spdy_over_npn); SSLClientSocketPool* ssl_pool = NULL; if (proxy_info()->is_direct()) @@ -792,6 +794,7 @@ scoped_refptr<SSLSocketParams> HttpStreamRequest::GenerateSslParams( scoped_refptr<HttpProxySocketParams> http_proxy_params, scoped_refptr<SOCKSSocketParams> socks_params, ProxyServer::Scheme proxy_scheme, + std::string hostname, bool want_spdy_over_npn) { if (factory_->IsTLSIntolerantServer(request_info().url)) { @@ -817,7 +820,7 @@ scoped_refptr<SSLSocketParams> HttpStreamRequest::GenerateSslParams( scoped_refptr<SSLSocketParams> ssl_params = new SSLSocketParams(tcp_params, socks_params, http_proxy_params, - proxy_scheme, request_info().url.HostNoBrackets(), + proxy_scheme, hostname, *ssl_config(), load_flags, force_spdy_always_ && force_spdy_over_ssl_, want_spdy_over_npn); diff --git a/net/http/http_stream_request.h b/net/http/http_stream_request.h index 10e6525..5a3ccb7 100644 --- a/net/http/http_stream_request.h +++ b/net/http/http_stream_request.h @@ -119,6 +119,7 @@ class HttpStreamRequest : public StreamFactory::StreamRequestJob { scoped_refptr<HttpProxySocketParams> http_proxy_params, scoped_refptr<SOCKSSocketParams> socks_params, ProxyServer::Scheme proxy_scheme, + std::string hostname, bool want_spdy_over_npn); // AlternateProtocol API |