зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 5eff2c0351a9 (bug 1418752) for marionette harness fails on OS X at /builds/worker/workspace/build/src/netwerk/base/nsNetUtil.cpp:2669 r=backout on a CLOSED TREE
This commit is contained in:
Родитель
1d4729afe6
Коммит
0d3cfac1b7
|
@ -75,8 +75,6 @@
|
|||
#include "nsHttpHandler.h"
|
||||
#include "nsNSSComponent.h"
|
||||
#include "nsIRedirectHistoryEntry.h"
|
||||
#include "nsICertBlocklist.h"
|
||||
#include "nsICertOverrideService.h"
|
||||
|
||||
#include <limits>
|
||||
|
||||
|
@ -2661,12 +2659,6 @@ void net_EnsurePSMInit()
|
|||
nsresult rv;
|
||||
nsCOMPtr<nsISupports> psm = do_GetService(PSM_COMPONENT_CONTRACTID, &rv);
|
||||
MOZ_ASSERT(NS_SUCCEEDED(rv));
|
||||
nsCOMPtr<nsISupports> sss = do_GetService(NS_SSSERVICE_CONTRACTID, &rv);
|
||||
MOZ_ASSERT(NS_SUCCEEDED(rv));
|
||||
nsCOMPtr<nsISupports> cbl = do_GetService(NS_CERTBLOCKLIST_CONTRACTID, &rv);
|
||||
MOZ_ASSERT(NS_SUCCEEDED(rv));
|
||||
nsCOMPtr<nsISupports> cos = do_GetService(NS_CERTOVERRIDE_CONTRACTID, &rv);
|
||||
MOZ_ASSERT(NS_SUCCEEDED(rv));
|
||||
}
|
||||
|
||||
bool NS_IsAboutBlank(nsIURI *uri)
|
||||
|
|
|
@ -162,10 +162,6 @@ NS_DEFINE_NAMED_CID(NS_SECURE_BROWSER_UI_CID);
|
|||
NS_DEFINE_NAMED_CID(NS_SITE_SECURITY_SERVICE_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_CERT_BLOCKLIST_CID);
|
||||
|
||||
// Components that require main thread initialization could cause a deadlock
|
||||
// in necko code (bug 1418752). To prevent it we initialize all such components
|
||||
// on main thread in advance in net_EnsurePSMInit(). Update that function when
|
||||
// new component with ThreadRestriction::MainThreadOnly is added.
|
||||
static const mozilla::Module::CIDEntry kNSSCIDs[] = {
|
||||
{ &kNS_NSSCOMPONENT_CID, false, nullptr, nsNSSComponentConstructor },
|
||||
{ &kNS_SSLSOCKETPROVIDER_CID, false, nullptr,
|
||||
|
|
Загрузка…
Ссылка в новой задаче