Bug 884200 - Ensure NSS is initiated on main thread. r=honza
authorJason Duell <jduell.mcbugs@gmail.com>
Fri, 21 Jun 2013 20:33:46 -0700
changeset 136041 e6d1090425fcdbf67d0642415538ead6879d0d5b
parent 136040 17c4c99f1ac2e9b2fc1b039266807656980a40c0
child 136042 0a7b5696c49afa31bb6ff9aed758a6512a7c1f39
push id29942
push userjduell@mozilla.com
push dateSat, 22 Jun 2013 03:34:30 +0000
treeherdermozilla-inbound@e6d1090425fc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershonza
bugs884200
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 884200 - Ensure NSS is initiated on main thread. r=honza
netwerk/protocol/http/nsHttpHandler.cpp
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -1598,21 +1598,21 @@ nsHttpHandler::NewProxiedChannel(nsIURI 
     }
 
     uint32_t caps = mCapabilities;
 
     if (https) {
         // enable pipelining over SSL if requested
         if (mPipeliningOverSSL)
             caps |= NS_HTTP_ALLOW_PIPELINING;
+    }
 
-        if (!IsNeckoChild()) {
-            // HACK: make sure PSM gets initialized on the main thread.
-            net_EnsurePSMInit();
-        }
+    if (!IsNeckoChild()) {
+        // HACK: make sure PSM gets initialized on the main thread.
+        net_EnsurePSMInit();
     }
 
     rv = httpChannel->Init(uri, caps, proxyInfo, proxyResolveFlags, proxyURI);
     if (NS_FAILED(rv))
         return rv;
 
     httpChannel.forget(result);
     return NS_OK;