summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 19:55:27 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 19:55:27 +0000
commit4f4de7e6e1393bf1b068337cdf8895e91addfa72 (patch)
tree872947e61b717b7ad582a2c5688e2bdb1e0b2b1f /net/socket_stream
parentf7002808992b52e582dd2fff531863de7b673b9e (diff)
downloadchromium_src-4f4de7e6e1393bf1b068337cdf8895e91addfa72.zip
chromium_src-4f4de7e6e1393bf1b068337cdf8895e91addfa72.tar.gz
chromium_src-4f4de7e6e1393bf1b068337cdf8895e91addfa72.tar.bz2
Correctly handle SSL Client Authentication requests when connecting
to an HTTPS/SPDY proxy. Modify SSLClientSocket classes to correctly set the host_and_port field of the cert_request_info. Modify HttpNetworkTransaction to use this field when populating the SSL client auth cache. BUG=59292 TEST=HttpProxyClientSocketPoolTest.SslClientAuth Review URL: http://codereview.chromium.org/4339001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 6d6efbe..4075e02 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -797,9 +797,10 @@ int SocketStream::DoSOCKSConnectComplete(int result) {
int SocketStream::DoSSLConnect() {
DCHECK(factory_);
// TODO(agl): look into plumbing SSLHostInfo here.
- socket_.reset(factory_->CreateSSLClientSocket(
- socket_.release(), url_.HostNoBrackets(), ssl_config_,
- NULL /* ssl_host_info */));
+ socket_.reset(factory_->CreateSSLClientSocket(socket_.release(),
+ HostPortPair::FromURL(url_),
+ ssl_config_,
+ NULL /* ssl_host_info */));
next_state_ = STATE_SSL_CONNECT_COMPLETE;
metrics_->OnSSLConnection();
return socket_->Connect(&io_callback_);