diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /net/socket/ssl_client_socket_openssl.h | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'net/socket/ssl_client_socket_openssl.h')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h index 31d5c1c..783132d 100644 --- a/net/socket/ssl_client_socket_openssl.h +++ b/net/socket/ssl_client_socket_openssl.h @@ -32,7 +32,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { // certificate during the SSL handshake. ssl_config specifies the SSL // settings. SSLClientSocketOpenSSL(ClientSocketHandle* transport_socket, - const std::string& hostname, + const HostPortPair& host_and_port, const SSLConfig& ssl_config); ~SSLClientSocketOpenSSL(); @@ -125,7 +125,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { BIO* transport_bio_; scoped_ptr<ClientSocketHandle> transport_; - std::string hostname_; + const HostPortPair host_and_port_; SSLConfig ssl_config_; bool completed_handshake_; |