Commit 1648da84 authored by Kathleen Brade's avatar Kathleen Brade
Browse files

fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic

Restore previous behavior: do not reset the SOCKS-related preferences when
the TOR_SOCKS_HOST and TOR_SOCKS_PORT environment variables are not set.
parent 6dc85374
......@@ -73,16 +73,12 @@ StartupObserver.prototype = {
this._prefs.setIntPref('network.proxy.type', 1);
}
this.logger.log(3, "Reset socks port to "+environ.get("TOR_SOCKS_PORT"));
} else {
this._prefs.setIntPref('network.proxy.socks_port', 9150);
}
if (environ.exists("TOR_SOCKS_HOST")) {
if (this.is_tbb) {
this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST"));
}
} else {
this._prefs.setCharPref('network.proxy.socks', '127.0.0.1');
}
if (environ.exists("TOR_TRANSPROXY")) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment