Another socks5-fix. Make sure that when we use a socks-proxy, it is not the

same as using a httpproxy so we must make sure to better check for http
proxies before we do HTTP proxy stuff. This included authorization and
URI usage in the request etc.