[tbb-commits] [torbutton/master] Bug 18466: Get domain isolator working with FF45

[gk at torproject.org]

commit d454bd4ac3eb71b3945ff64704bb87fdb211d711
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Wed Mar 2 16:45:08 2016 -0800

    Bug 18466: Get domain isolator working with FF45
---
 src/components/domain-isolator.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js
index caf45cf..2639322 100644
--- a/src/components/domain-isolator.js
+++ b/src/components/domain-isolator.js
@@ -18,7 +18,7 @@ let logger = Cc["@torproject.org/torbutton-logger;1"]
 
 // ## mozilla namespace.
 // Useful functionality for interacting with Mozilla services.
-let mozilla = mozilla || {};
+let mozilla = {};
 
 // __mozilla.protocolProxyService__.
 // Mozilla's protocol proxy service, useful for managing proxy connections made
@@ -47,7 +47,7 @@ mozilla.registerProxyChannelFilter = function (filterFunction, positionIndex) {
 };
 
 // ## tor functionality.
-let tor = tor || {};
+let tor = {};
 
 // __tor.noncesForDomains__.
 // A mutable map that records what nonce we are using for each domain.
@@ -73,13 +73,14 @@ tor.socksProxyCredentials = function (originalProxy, domain) {
   }
   let proxy = originalProxy.QueryInterface(Ci.nsIProxyInfo);
   return mozilla.protocolProxyService
-           .newSOCKSProxyInfo(proxy.host,
-                              proxy.port,
-                              domain, // username
-                              tor.noncesForDomains[domain].toString(), // password
-                              proxy.flags,
-                              proxy.failoverTimeout,
-                              proxy.failoverProxy);
+    .newProxyInfoWithAuth("socks",
+                          proxy.host,
+                          proxy.port,
+                          domain, // username
+                          tor.noncesForDomains[domain].toString(), // password
+                          proxy.flags,
+                          proxy.failoverTimeout,
+                          proxy.failoverProxy);
 };
 
 tor.newCircuitForDomain = function(domain) {