Bug 1050598 - Fix proxy_over_tls pref. r=hurley, a=sledru
authorPatrick McManus <mcmanus@ducksong.com>
Wed, 30 Jul 2014 12:02:00 -0400
changeset 217461 5c3ac814a2873fd0b2218cc726820929781a06a2
parent 217460 2211ef492219bf2a63e99e188b1812935e1590cc
child 217462 cd7100982c732c8d9f1ba138083491ccb4242754
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershurley, sledru
bugs1050598
milestone33.0a2
Bug 1050598 - Fix proxy_over_tls pref. r=hurley, a=sledru
netwerk/base/src/nsProtocolProxyService.cpp
--- a/netwerk/base/src/nsProtocolProxyService.cpp
+++ b/netwerk/base/src/nsProtocolProxyService.cpp
@@ -938,17 +938,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;