bug 1050598 - fix proxy_over_tls pref r=hurley

--HG--
extra : rebase_source : 33517c42a9966930fd68912bf1c7a7b6fb4c2bb7

netwerk/base/src/nsProtocolProxyService.cpp

@@ -943,7 +943,7 @@ nsProtocolProxyService::ProcessPACString(const nsCString &pacString,
     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;
         }