From ed3cda77895868346786b986a6ef3cecb1567d3c Mon Sep 17 00:00:00 2001
From: Jason Duell <jduell.mcbugs@gmail.com>
Date: Thu, 30 Sep 2010 23:57:01 -0700
Subject: [PATCH] Bug 599122: Don't initialize PSM on child. r=honza
 a=blocking-fennec-2.0b2

---
 netwerk/protocol/http/nsHttpHandler.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index f7b0cc8fc77c..84ae39823c04 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -1527,12 +1527,17 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
         if (mPipeliningOverSSL)
             caps |= NS_HTTP_ALLOW_PIPELINING;
 
-        // HACK: make sure PSM gets initialized on the main thread.
-        nsCOMPtr<nsISocketProviderService> spserv =
-                do_GetService(NS_SOCKETPROVIDERSERVICE_CONTRACTID);
-        if (spserv) {
-            nsCOMPtr<nsISocketProvider> provider;
-            spserv->GetSocketProvider("ssl", getter_AddRefs(provider));
+#ifdef MOZ_IPC
+        if (!IsNeckoChild()) 
+#endif
+        {
+            // HACK: make sure PSM gets initialized on the main thread.
+            nsCOMPtr<nsISocketProviderService> spserv =
+                    do_GetService(NS_SOCKETPROVIDERSERVICE_CONTRACTID);
+            if (spserv) {
+                nsCOMPtr<nsISocketProvider> provider;
+                spserv->GetSocketProvider("ssl", getter_AddRefs(provider));
+            }
         }
     }