corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 599122: Don't initialize PSM on child. r=honza a=blocking-fennec-2.0b2

Browse Source
This commit is contained in:
Jason Duell
2010-09-30 23:57:01 -07:00
parent 7f2c2002b8
commit ed3cda7789
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netwerk/protocol/http/nsHttpHandler.cpp
View File

@@ -1527,6 +1527,10 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
if (mPipeliningOverSSL) if (mPipeliningOverSSL)
caps |= NS_HTTP_ALLOW_PIPELINING; caps |= NS_HTTP_ALLOW_PIPELINING;
#ifdef MOZ_IPC
if (!IsNeckoChild())
#endif
{
// HACK: make sure PSM gets initialized on the main thread. // HACK: make sure PSM gets initialized on the main thread.
nsCOMPtr<nsISocketProviderService> spserv = nsCOMPtr<nsISocketProviderService> spserv =
do_GetService(NS_SOCKETPROVIDERSERVICE_CONTRACTID); do_GetService(NS_SOCKETPROVIDERSERVICE_CONTRACTID);
@@ -1535,6 +1539,7 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
spserv->GetSocketProvider("ssl", getter_AddRefs(provider)); spserv->GetSocketProvider("ssl", getter_AddRefs(provider));
} }
} }
}
rv = httpChannel->Init(uri, caps, proxyInfo); rv = httpChannel->Init(uri, caps, proxyInfo);
if (NS_FAILED(rv)) if (NS_FAILED(rv))