diff --git a/doc/config.but b/doc/config.but index 1ac177ef..d077c4a0 100644 --- a/doc/config.but +++ b/doc/config.but @@ -1831,9 +1831,9 @@ set it to \q{Yes}, PuTTY will always pass host names straight to the proxy without trying to look them up first. If you set this option to \q{Auto} (the default), PuTTY will do -something it considers appropriate for each type of proxy. Telnet -and HTTP proxies will have host names passed straight to them; SOCKS -proxies will not. +something it considers appropriate for each type of proxy. Telnet, +HTTP, and SOCKS5 proxies will have host names passed straight to +them; SOCKS4 proxies will not. Note that if you are doing DNS at the proxy, you should make sure that your proxy exclusion settings (see \k{config-proxy-exclude}) do diff --git a/proxy.c b/proxy.c index a27c38ee..ad3b8146 100644 --- a/proxy.c +++ b/proxy.c @@ -16,9 +16,7 @@ #define do_proxy_dns(cfg) \ (cfg->proxy_dns == FORCE_ON || \ - (cfg->proxy_dns == AUTO && \ - cfg->proxy_type != PROXY_SOCKS4 && \ - cfg->proxy_type != PROXY_SOCKS5)) + (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS4)) /* * Call this when proxy negotiation is complete, so that this