diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 06:05:06 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 06:05:06 +0000 |
| commit | 25f7a3522b9457cf63fd1670c2199d0158e75aaa (patch) | |
| tree | e1d50ec080160ab48683b9c6ed7ba10fdb63d5ae | |
| parent | a702758968507f0eabb01651c8a98d240934144b (diff) | |
| download | chromium_src-25f7a3522b9457cf63fd1670c2199d0158e75aaa.zip chromium_src-25f7a3522b9457cf63fd1670c2199d0158e75aaa.tar.gz chromium_src-25f7a3522b9457cf63fd1670c2199d0158e75aaa.tar.bz2 | |
Move NSS SSL functions off the IO thread on Linux.
This matches the existing behaviour of ChromeOS. Windows and
OS X will continue running SSL functions on the IO thread, for now.
BUG=90277
TEST=Existing unit tests (net_, content_, browser_, remoting_) cover much of
the core functionality. Further testing involves requires functionality
not yet supported on Linux.
Review URL: https://chromiumcodereview.appspot.com/10535028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140968 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/socket/client_socket_factory.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index ade6874..77fb481 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -33,10 +33,11 @@ namespace { bool g_use_system_ssl = false; -// ChromeOS uses a hardware TPM module that may cause NSS operations to -// block for upwards of several seconds. To avoid blocking all network and -// IPC activity, run NSS SSL functions on a dedicated thread. -#if defined(OS_CHROMEOS) +// ChromeOS and Linux may require interaction with smart cards or TPMs, which +// may cause NSS functions to block for upwards of several seconds. To avoid +// blocking all activity on the current task runner, such as network or IPC +// traffic, run NSS SSL functions on a dedicated thread. +#if defined(OS_CHROMEOS) || defined(OS_LINUX) bool g_use_dedicated_nss_thread = true; #else bool g_use_dedicated_nss_thread = false; |