bug 1045640 - disable tls proxying bug 378637 on gecko 32 r=backout a=lmandel r=hurley
authorPatrick McManus <mcmanus@ducksong.com>
Mon, 11 Aug 2014 13:01:14 -0400
changeset 208288 c9dec07b4148
parent 208287 92c3567e5a0c
child 208289 b8d426a326f5
push id3804
push usermcmanus@ducksong.com
push date2014-08-11 17:47 +0000
treeherdermozilla-beta@c9dec07b4148 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, lmandel, hurley
bugs1045640, 378637
milestone32.0
bug 1045640 - disable tls proxying bug 378637 on gecko 32 r=backout a=lmandel r=hurley
modules/libpref/src/init/all.js
netwerk/base/src/nsProtocolProxyService.cpp
--- 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
--- a/netwerk/base/src/nsProtocolProxyService.cpp
+++ b/netwerk/base/src/nsProtocolProxyService.cpp
@@ -936,17 +936,17 @@ nsProtocolProxyService::ProcessPACString
         return;
     }
 
     const char *proxies = pacString.get();
 
     nsProxyInfo *pi = nullptr, *first = nullptr, *last = nullptr;
     while (*proxies) {
         proxies = ExtractProxyInfo(proxies, aResolveFlags, &pi);
-        if (pi && !mProxyOverTLS) {
+        if (pi && (pi->mType == kProxyType_HTTPS) && !mProxyOverTLS) {
             delete pi;
             pi = nullptr;
         }
 
         if (pi) {
             if (last) {
                 NS_ASSERTION(last->mNext == nullptr, "leaking nsProxyInfo");
                 last->mNext = pi;