Index: remoting/client/plugin/chromoting_instance.cc |
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc |
index a3ef5409a66b2b5827aeef162bd00f377da4a4ba..fb3da914ed1688d3e9f6883964ddec6e59642d8d 100644 |
--- a/remoting/client/plugin/chromoting_instance.cc |
+++ b/remoting/client/plugin/chromoting_instance.cc |
@@ -21,6 +21,7 @@ |
#include "base/values.h" |
#include "jingle/glue/thread_wrapper.h" |
#include "media/base/media.h" |
+#include "net/socket/ssl_server_socket.h" |
#include "ppapi/cpp/completion_callback.h" |
#include "ppapi/cpp/input_event.h" |
#include "ppapi/cpp/mouse_cursor.h" |
@@ -187,6 +188,13 @@ bool ChromotingInstance::Init(uint32_t argc, |
return false; |
} |
+ // Enable support for SSL server sockets, which must be done as early as |
+ // possible, preferably before any NSS SSL sockets (client or server) have |
+ // been created. |
+ // It's possible that the hosting process has already made use of SSL, in |
+ // which case, there may be a slight race. |
+ net::EnableSSLServerSockets(); |
+ |
// Start all the threads. |
context_.Start(); |