Commit d80b5b93 authored by Jérémy Bobbio's avatar Jérémy Bobbio Committed by Mike Perry
Browse files

Bug #4453: Set SOCKS port and host only with recommended settings 

Both can always be overriden on startup using TOR_SOCKS_* environment
variables.
parent 5f3db124

src/chrome/content/torbutton.js

+2 −2
Original line number Diff line number Diff line
@@ -3893,7 +3893,7 @@ function torbutton_do_startup() 
          if (m_tb_tbb) {

              m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT")));

          }

        } else {

        } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') {

          m_tb_prefs.setIntPref('extensions.torbutton.socks_port', 9050);

        }
@@ -3902,7 +3902,7 @@ function torbutton_do_startup() 
          if (m_tb_tbb) {

              m_tb_prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST"));

          }

        } else {

        } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') {

          m_tb_prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1');

        }