diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 20:19:44 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 20:19:44 +0000 |
| commit | a4965c88bb9b0b6b3465f8604bfbfb1f4dbb0a03 (patch) | |
| tree | af5d5f1fd060390bc5dae29b21837441970d97d9 /remoting/host/remoting_me2me_host.cc | |
| parent | f28b436a33f65b1d22d8c7f047fe1c61d70f7920 (diff) | |
| download | chromium_src-a4965c88bb9b0b6b3465f8604bfbfb1f4dbb0a03.zip chromium_src-a4965c88bb9b0b6b3465f8604bfbfb1f4dbb0a03.tar.gz chromium_src-a4965c88bb9b0b6b3465f8604bfbfb1f4dbb0a03.tar.bz2 | |
Add an explicit function to init NSS for SSL server sockets
BUG=131622
TEST=tsan goes green for existing tests
Review URL: https://chromiumcodereview.appspot.com/10543106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/remoting_me2me_host.cc')
| -rw-r--r-- | remoting/host/remoting_me2me_host.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 739efce..bb87fb5 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -21,6 +21,7 @@ #include "build/build_config.h" #include "crypto/nss_util.h" #include "net/base/network_change_notifier.h" +#include "net/socket/ssl_server_socket.h" #include "remoting/base/breakpad.h" #include "remoting/base/constants.h" #include "remoting/host/branding.h" @@ -546,6 +547,10 @@ int main(int argc, char** argv) { gfx::GtkInitFromCommandLine(*cmd_line); #endif // TOOLKIT_GTK + // Enable support for SSL server sockets, which must be done while still + // single-threaded. + net::EnableSSLServerSockets(); + remoting::HostProcess me2me_host; me2me_host.InitWithCommandLine(cmd_line); |