mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bug 1301407 - Ensure nss initialized during nsHttpHandler initialization. r=mcmanus, r=keeler
This commit is contained in:
parent
a3e4e0546b
commit
30904871cc
@ -304,7 +304,8 @@ FINAL_LIBRARY = 'xul'
|
||||
LOCAL_INCLUDES += [
|
||||
'/docshell/base',
|
||||
'/dom/base',
|
||||
'/netwerk/protocol/http'
|
||||
'/netwerk/protocol/http',
|
||||
'/security/pkix/include'
|
||||
]
|
||||
|
||||
if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
|
||||
|
@ -69,6 +69,7 @@
|
||||
#include "nsIScriptError.h"
|
||||
#include "nsISiteSecurityService.h"
|
||||
#include "nsHttpHandler.h"
|
||||
#include "nsNSSComponent.h"
|
||||
|
||||
#ifdef MOZ_WIDGET_GONK
|
||||
#include "nsINetworkManager.h"
|
||||
@ -2125,12 +2126,9 @@ NS_GetFilenameFromDisposition(nsAString &aFilename,
|
||||
|
||||
void net_EnsurePSMInit()
|
||||
{
|
||||
nsCOMPtr<nsISocketProviderService> spserv =
|
||||
do_GetService(NS_SOCKETPROVIDERSERVICE_CONTRACTID);
|
||||
if (spserv) {
|
||||
nsCOMPtr<nsISocketProvider> provider;
|
||||
spserv->GetSocketProvider("ssl", getter_AddRefs(provider));
|
||||
}
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsISupports> psm = do_GetService(PSM_COMPONENT_CONTRACTID, &rv);
|
||||
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv));
|
||||
}
|
||||
|
||||
bool NS_IsAboutBlank(nsIURI *uri)
|
||||
|
Loading…
Reference in New Issue
Block a user