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

Unified Diff: net/socket/ssl_client_socket.cc

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed the structure of pending_sockets_and_callbacks_ and made cl compatible with nss. (Fixed one… Created 6 years, 5 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
Index: net/socket/ssl_client_socket.cc
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
index 1b2fe144304955bd0c423aca96d90226c45d7f4a..7d21e8b5edae486ede71aab0c7f6a31764d4668b 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -103,6 +103,16 @@ NextProto SSLClientSocket::GetNegotiatedProtocol() const {
return protocol_negotiated_;
}
+// static
+std::string SSLClientSocket::FormatSessionCacheKey(
+ std::string host_and_port,
+ std::string ssl_session_cache_shard) {
+ std::string result = host_and_port;
+ result.append("/");
+ result.append(ssl_session_cache_shard);
+ return result;
+}
+
bool SSLClientSocket::IgnoreCertError(int error, int load_flags) {
if (error == OK || load_flags & LOAD_IGNORE_ALL_CERT_ERRORS)
return true;
@@ -210,4 +220,17 @@ bool SSLClientSocket::IsChannelIDEnabled(
return true;
}
+// static
+bool SSLClientSocket::enable_connect_job_waiting_ = false;
+
+// static
+void SSLClientSocket::EnableConnectJobWaiting(bool enable) {
+ enable_connect_job_waiting_ = enable;
+}
+
+// static
+bool SSLClientSocket::GetEnableConnectJobWaiting() {
+ return enable_connect_job_waiting_;
+}
+
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698