[tor-bugs] #5000 [Tor Browser]: Differences in prefs.js between windows and *nix
Tor Bug Tracker & Wiki
torproject-admin at torproject.org
Wed Feb 1 21:52:54 UTC 2012
#5000: Differences in prefs.js between windows and *nix
-------------------------+--------------------------------------------------
Reporter: Sebastian | Owner: mikeperry
Type: defect | Status: new
Priority: normal | Milestone:
Component: Tor Browser | Version:
Keywords: | Parent:
Points: | Actualpoints:
-------------------------+--------------------------------------------------
I have a patch which I think is completely save to make the windows-4.0.js
file more like the no-polipo-4.0.js file. I believe that all these are
accidental differences:
{{{
diff --git a/build-scripts/config/windows-4.0.js b/build-
scripts/config/windows-4.0.js
index c06f9e9..da7a878 100644
--- a/build-scripts/config/windows-4.0.js
+++ b/build-scripts/config/windows-4.0.js
@@ -69,13 +69,8 @@ user_pref("extensions.enabledItems", "langpack-en-
US at firefox.mozilla.org:,{73a6f
user_pref("extensions.enabledScopes", 1);
user_pref("extensions.pendingOperations", false);
user_pref("extensions.torbutton.fresh_install", false);
-user_pref("extensions.torbutton.http_port", 8118);
-user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.https_port", 8118);
-user_pref("extensions.torbutton.https_proxy", "127.0.0.1");
user_pref("extensions.torbutton.locked_mode", true);
user_pref("extensions.torbutton.normal_exit", true);
-user_pref("extensions.torbutton.proxies_applied", true);
user_pref("extensions.torbutton.restore_tor", true);
user_pref("extensions.torbutton.saved.auto_update", false);
user_pref("extensions.torbutton.saved.share_proxy_settings", false);
@@ -93,10 +88,10 @@ user_pref("extensions.update.notifyUser", true);
user_pref("general.appname.override", "Netscape");
user_pref("general.appversion.override", "5.0 (Windows; en-US)");
user_pref("general.buildID.override", "0");
+user_pref("general.useragent.locale", "SHPONKA");
user_pref("general.oscpu.override", "Windows NT 6.1");
user_pref("general.platform.override", "Win32");
user_pref("general.productSub.override", "20100401");
-user_pref("general.useragent.locale", "SHPONKA");
user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows
NT 6.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3");
user_pref("general.useragent.vendor", "");
user_pref("general.useragent.vendorSub", "");
@@ -121,14 +116,9 @@ user_pref("network.protocol-handler.warn-
external.mailto", true);
user_pref("network.protocol-handler.warn-external.news", true);
user_pref("network.protocol-handler.warn-external.nntp", true);
user_pref("network.protocol-handler.warn-external.snews", true);
-user_pref("network.proxy.http", "127.0.0.1");
-user_pref("network.proxy.http_port", 8118);
-user_pref("network.proxy.no_proxies_on", "127.0.0.1");
user_pref("network.proxy.socks", "127.0.0.1");
user_pref("network.proxy.socks_port", 9050);
user_pref("network.proxy.socks_remote_dns", true);
-user_pref("network.proxy.ssl", "127.0.0.1");
-user_pref("network.proxy.ssl_port", 8118);
user_pref("network.proxy.type", 1);
user_pref("network.security.ports.banned", "8118,8123,9050,9051");
user_pref("noscript.ABE.enabled", false);
@@ -138,10 +128,10 @@ user_pref("noscript.autoReload", false);
user_pref("noscript.contentBlocker", true);
user_pref("noscript.default", "about:blank about:credits
addons.mozilla.org flashgot.net google.com gstatic.com
googlesyndication.com informaction.com yahoo.com yimg.com maone.net
noscript.net hotmail.com msn.com passport.com passport.ne
user_pref("noscript.firstRunRedirection", false);
-user_pref("noscript.forbidWebGL", true);
user_pref("noscript.global", true);
user_pref("noscript.gtemp", "");
user_pref("noscript.opacizeObject", 3);
+user_pref("noscript.forbidWebGL", true);
user_pref("noscript.options.tabSelectedIndexes", "5,0,0");
user_pref("noscript.policynames", "");
user_pref("noscript.secureCookies", true);
}}}
however, there's still a diff that I find curious. Can someone take a
look, and for each difference see if it is alright that we only have
something set on linux or windows? My goal would be to use the same file
everywhere.
{{{
$ diff -u build-scripts/config/no-polipo-4.0.js build-
scripts/config/windows-4.0.js
--- build-scripts/config/no-polipo-4.0.js 2012-02-01
22:33:04.000000000 +0100
+++ build-scripts/config/windows-4.0.js 2012-02-01 22:45:50.000000000
+0100
@@ -45,6 +45,7 @@
user_pref("browser.search.suggest.enabled", false);
user_pref("browser.search.update", false);
user_pref("browser.sessionstore.privacy_level", 2);
+user_pref("browser.sessionstore.resume_session_once", true);
user_pref("browser.shell.checkDefaultBrowser", false);
user_pref("browser.startup.homepage", "https://check.torproject.org/?lang
=en-US&small=1");
user_pref("browser.startup.homepage_override.buildID", "20110325121920");
@@ -69,19 +70,21 @@
user_pref("extensions.pendingOperations", false);
user_pref("extensions.torbutton.fresh_install", false);
user_pref("extensions.torbutton.locked_mode", true);
-user_pref("extensions.torbutton.proxies_applied", true);
+user_pref("extensions.torbutton.normal_exit", true);
user_pref("extensions.torbutton.restore_tor", true);
user_pref("extensions.torbutton.saved.auto_update", false);
user_pref("extensions.torbutton.saved.share_proxy_settings", false);
user_pref("extensions.torbutton.saved.socks_version", 5);
+user_pref("extensions.torbutton.saved.type", 1);
user_pref("extensions.torbutton.settings_applied", true);
user_pref("extensions.torbutton.socks_host", "127.0.0.1");
user_pref("extensions.torbutton.socks_port", 9050);
+user_pref("extensions.torbutton.startup", true);
user_pref("extensions.torbutton.tor_enabled", true);
user_pref("extensions.torbutton.tor_memory_jar", true);
user_pref("extensions.torbutton.tz_string", "UTC+00:00");
user_pref("extensions.update.enabled", true);
-user_pref("extensions.update.notifyUser", false);
+user_pref("extensions.update.notifyUser", true);
user_pref("general.appname.override", "Netscape");
user_pref("general.appversion.override", "5.0 (Windows; en-US)");
user_pref("general.buildID.override", "0");
@@ -165,3 +168,4 @@
user_pref("urlclassifier.tableversion.goog-white-url", "1.371");
user_pref("xpinstall.whitelist.add", "");
user_pref("xpinstall.whitelist.add.36", "");
+user_pref("security.ssl.enable_false_start", true);
}}}
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/5000>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list