From 7ab5bbd128a32d32046201df76b86d370efa65af Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Tue, 19 Oct 2010 13:33:21 +0000 Subject: Revert revert 62918 - net: clean up SSLHostInfo construction." Was reverted in r62922 due to a change landing between the try run and the commit. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63046 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/jingle_glue/ssl_socket_adapter.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'remoting') diff --git a/remoting/jingle_glue/ssl_socket_adapter.cc b/remoting/jingle_glue/ssl_socket_adapter.cc index 6eca04b..3f49325 100644 --- a/remoting/jingle_glue/ssl_socket_adapter.cc +++ b/remoting/jingle_glue/ssl_socket_adapter.cc @@ -67,7 +67,8 @@ int SSLSocketAdapter::BeginSSL() { transport_socket_->set_addr(talk_base::SocketAddress(hostname_, 0)); ssl_socket_.reset( net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket( - transport_socket_, hostname_.c_str(), ssl_config)); + transport_socket_, hostname_.c_str(), ssl_config, + NULL /* ssl_host_info */)); int result = ssl_socket_->Connect(&connected_callback_); -- cgit v1.1