Commit ab5010d4 authored by Mike Perry's avatar Mike Perry
Browse files

Merge remote-tracking branch 'arthur/ftp-isolation' into 1.9-next

parents dbe9a0d1 0116a2ac

src/components/domain-isolator.js

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ tor.newCircuitForDomain = function(domain) { 
tor.isolateCircuitsByDomain = function () {

  mozilla.registerProxyChannelFilter(function (aChannel, aProxy) {

    try {

      let channel = aChannel.QueryInterface(Ci.nsIHttpChannel),

      let channel = aChannel.QueryInterface(Ci.nsIChannel),

          firstPartyURI = mozilla.thirdPartyUtil.getFirstPartyURIFromChannel(channel, true)

                            .QueryInterface(Ci.nsIURI),

          firstPartyDomain = mozilla.thirdPartyUtil
@@ -108,6 +108,7 @@ tor.isolateCircuitsByDomain = function () { 
                      replacementProxy.username + ":" + replacementProxy.password); 

      return replacementProxy;

    } catch (err) {

      logger.eclog(3, err.message);

      if (Date.now() - tor.unknownDirtySince > 1000*10*60) {

        logger.eclog(3, "tor catchall circuit has been dirty for over 10 minutes. Rotating.");

        tor.newCircuitForDomain("--unknown--");