Bug 884200 - Ensure NSS is initiated on main thread. r=honza

This commit is contained in:
Jason Duell 2013-06-21 20:33:46 -07:00
parent 2ee83b272b
commit ca216420b6

View File

@ -1603,11 +1603,11 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
// enable pipelining over SSL if requested // enable pipelining over SSL if requested
if (mPipeliningOverSSL) if (mPipeliningOverSSL)
caps |= NS_HTTP_ALLOW_PIPELINING; caps |= NS_HTTP_ALLOW_PIPELINING;
}
if (!IsNeckoChild()) { if (!IsNeckoChild()) {
// HACK: make sure PSM gets initialized on the main thread. // HACK: make sure PSM gets initialized on the main thread.
net_EnsurePSMInit(); net_EnsurePSMInit();
}
} }
rv = httpChannel->Init(uri, caps, proxyInfo, proxyResolveFlags, proxyURI); rv = httpChannel->Init(uri, caps, proxyInfo, proxyResolveFlags, proxyURI);