Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Unified Diff: net/socket/ssl_client_socket_pool.cc

Issue 3174004: Pass both hostname and port into SSLClientSocket (Closed)
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool.cc
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 531c836883071ad9afb708d436a7e699b55f52d3..5460abc3a87a6a3e62b7c8037c64c0f73cd392e2 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -20,7 +20,7 @@ SSLSocketParams::SSLSocketParams(
const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
const scoped_refptr<SOCKSSocketParams>& socks_params,
ProxyServer::Scheme proxy,
- const std::string& hostname,
+ const HostPortPair& host_port_pair,
const SSLConfig& ssl_config,
int load_flags,
bool force_spdy_over_ssl,
@@ -29,7 +29,7 @@ SSLSocketParams::SSLSocketParams(
http_proxy_params_(http_proxy_params),
socks_params_(socks_params),
proxy_(proxy),
- hostname_(hostname),
+ host_port_pair_(host_port_pair),
ssl_config_(ssl_config),
load_flags_(load_flags),
force_spdy_over_ssl_(force_spdy_over_ssl),
@@ -263,7 +263,7 @@ int SSLConnectJob::DoSSLConnect() {
ssl_connect_start_time_ = base::TimeTicks::Now();
ssl_socket_.reset(client_socket_factory_->CreateSSLClientSocket(
- transport_socket_handle_.release(), params_->hostname(),
+ transport_socket_handle_.release(), params_->host_port_pair(),
params_->ssl_config()));
return ssl_socket_->Connect(&callback_);
}
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698