Index: net/socket/ssl_client_socket_openssl.cc |
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc |
index 89cb40592952b387939d39c8ea21938f96c2bd2f..c495efc0ed1819a3dd5f1f4bb657c25cdd55e5ae 100644 |
--- a/net/socket/ssl_client_socket_openssl.cc |
+++ b/net/socket/ssl_client_socket_openssl.cc |
@@ -374,6 +374,14 @@ SSLClientSocketOpenSSL::~SSLClientSocketOpenSSL() { |
Disconnect(); |
} |
+// Compute a unique string for the SSL session cache. |
+std::string SSLClientSocketOpenSSL::GetSessionCacheKey() const { |
+ std::string result = host_and_port_.ToString(); |
+ result.append("/"); |
+ result.append(ssl_session_cache_shard_); |
+ return result; |
+} |
+ |
bool SSLClientSocketOpenSSL::InSessionCache() const { |
SSLContext* context = SSLContext::GetInstance(); |
std::string cache_key = GetSessionCacheKey(); |
@@ -845,10 +853,6 @@ void SSLClientSocketOpenSSL::DoWriteCallback(int rv) { |
base::ResetAndReturn(&user_write_callback_).Run(rv); |
} |
-std::string SSLClientSocketOpenSSL::GetSessionCacheKey() const { |
- return CreateSessionCacheKey(host_and_port_, ssl_session_cache_shard_); |
-} |
- |
void SSLClientSocketOpenSSL::OnHandshakeCompletion() { |
if (!handshake_completion_callback_.is_null()) |
base::ResetAndReturn(&handshake_completion_callback_).Run(); |