Comment 5 for bug 801346

Looks like it, but it still has to go through the usual "land on trunk first, then on branches if approved" cycle. But what's more important is that this patch is apparently reversed - Michael, did you take that into account when you reviewed it?

Also, did you test this patch, Ian?
I don't know this code, but with your patch I'm not sure how the fallback to the SOCKS proxy can work when no specific protocol proxy is set. For example, when looking for a proxy for the http protocol, doesn't the control flow always take the first "if" branch and leave the whole if block after unsuccessfully trying to get an http proxy, without ever entering the SOCKS proxy "else" branch?