Bug 1346711 - Backout changeset 36839839cfa7 (bug 1334443) a=backout
authorValentin Gosu <valentin.gosu@gmail.com>
Tue, 14 Mar 2017 15:28:48 +0100
changeset 347531 a67eec3033c48c0b1bfb473bba9c7e603ba3139e
parent 347530 e8eec4f84d97a22d6e57550cf9a2a60b09ac897e
child 347532 69cd9c72bd4ed419e3f7f7b5ab64ee0fa8bd89a2
push id88036
push uservalentin.gosu@gmail.com
push dateTue, 14 Mar 2017 14:29:01 +0000
treeherdermozilla-inbound@a67eec3033c4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1346711, 1334443
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1346711 - Backout changeset 36839839cfa7 (bug 1334443) a=backout proxy_GetStringPref also strips whitespace, thus it breaks parsing a space separated list MozReview-Commit-ID: F9SoMkbI28z
netwerk/base/nsProtocolProxyService.cpp
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -638,19 +638,20 @@ nsProtocolProxyService::PrefsChanged(nsI
                           mProxyOverTLS);
     }
 
     if (!pref || !strcmp(pref, PROXY_PREF("failover_timeout")))
         proxy_GetIntPref(prefBranch, PROXY_PREF("failover_timeout"),
                          mFailedProxyTimeout);
 
     if (!pref || !strcmp(pref, PROXY_PREF("no_proxies_on"))) {
-        nsCString no_proxies;
-        proxy_GetStringPref(prefBranch, PROXY_PREF("no_proxies_on"), no_proxies);
-        LoadHostFilters(no_proxies.get());
+        rv = prefBranch->GetCharPref(PROXY_PREF("no_proxies_on"),
+                                     getter_Copies(tempString));
+        if (NS_SUCCEEDED(rv))
+            LoadHostFilters(tempString.get());
     }
 
     // We're done if not using something that could give us a PAC URL
     // (PAC, WPAD or System)
     if (mProxyConfig != PROXYCONFIG_PAC && mProxyConfig != PROXYCONFIG_WPAD &&
         mProxyConfig != PROXYCONFIG_SYSTEM)
         return;