bug 1045640 - disable tls proxying bug 378637 on gecko 32 r=backout a=lmandel
💩💩 backed out by 433a7a6a2c25 💩 💩
authorPatrick McManus <mcmanus@ducksong.com>
Tue, 29 Jul 2014 22:58:55 -0400
changeset 208195 97a654ff8682
parent 208194 f1b3abcc9555
child 208196 433a7a6a2c25
push id3762
push usermcmanus@ducksong.com
push date2014-07-30 03:05 +0000
treeherdermozilla-beta@97a654ff8682 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, lmandel
bugs1045640, 378637
milestone32.0
bug 1045640 - disable tls proxying bug 378637 on gecko 32 r=backout a=lmandel
modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1464,17 +1464,17 @@ pref("network.proxy.ftp_port",          
 pref("network.proxy.http",                  "");
 pref("network.proxy.http_port",             0);
 pref("network.proxy.ssl",                   "");
 pref("network.proxy.ssl_port",              0);
 pref("network.proxy.socks",                 "");
 pref("network.proxy.socks_port",            0);
 pref("network.proxy.socks_version",         5);
 pref("network.proxy.socks_remote_dns",      false);
-pref("network.proxy.proxy_over_tls",        true);
+pref("network.proxy.proxy_over_tls",        false);
 pref("network.proxy.no_proxies_on",         "localhost, 127.0.0.1");
 pref("network.proxy.failover_timeout",      1800); // 30 minutes
 pref("network.online",                      true); //online/offline
 #ifdef RELEASE_BUILD
 pref("network.cookie.cookieBehavior",       0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-limitForeign
 #else
 pref("network.cookie.cookieBehavior",       3); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-limitForeign
 #endif