зеркало из https://github.com/mozilla/pjs.git
Don't bother checking if NSS is in a child process unless MOZ_IPC is defined. r+a+=bz
Followup to Bug 559711. e10s HTTP: turn off NSS in child process(es)
This commit is contained in:
Родитель
b4a9f61430
Коммит
509c62015f
|
@ -120,7 +120,9 @@
|
||||||
#include "secerr.h"
|
#include "secerr.h"
|
||||||
#include "sslerr.h"
|
#include "sslerr.h"
|
||||||
|
|
||||||
|
#ifdef MOZ_IPC
|
||||||
#include "nsXULAppAPI.h"
|
#include "nsXULAppAPI.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
#include "nsILocalFileWin.h"
|
#include "nsILocalFileWin.h"
|
||||||
|
@ -285,10 +287,12 @@ nsTokenEventRunnable::Run()
|
||||||
// creating any other components.
|
// creating any other components.
|
||||||
PRBool EnsureNSSInitialized(EnsureNSSOperator op)
|
PRBool EnsureNSSInitialized(EnsureNSSOperator op)
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_IPC
|
||||||
if (GeckoProcessType_Default != XRE_GetProcessType()) {
|
if (GeckoProcessType_Default != XRE_GetProcessType()) {
|
||||||
NS_ERROR("Trying to initialize PSM/NSS in a non-chrome process!");
|
NS_ERROR("Trying to initialize PSM/NSS in a non-chrome process!");
|
||||||
return PR_FALSE;
|
return PR_FALSE;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static PRBool loading = PR_FALSE;
|
static PRBool loading = PR_FALSE;
|
||||||
static PRInt32 haveLoaded = 0;
|
static PRInt32 haveLoaded = 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче