nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Change proxy-dns `Auto' default for SOCKS5 from local DNS to remote DNS.

Browse Source 
SOCKS5 should always be able to do this, and I suspect our not doing so
dates from when the SOCKS proxy types were under a single configuration
option (pre-r3168).

[originally from svn r5654]
This commit is contained in:
Jacob Nevins 2005-04-22 00:00:49 +00:00
parent fb581ac625
commit f2537676cc
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/config.but
View File

@ -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. proxy without trying to look them up first.
If you set this option to \q{Auto} (the default), PuTTY will do If you set this option to \q{Auto} (the default), PuTTY will do
something it considers appropriate for each type of proxy. Telnet something it considers appropriate for each type of proxy. Telnet,
and HTTP proxies will have host names passed straight to them; SOCKS HTTP, and SOCKS5 proxies will have host names passed straight to
proxies will not. them; SOCKS4 proxies will not.
Note that if you are doing DNS at the proxy, you should make sure 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 that your proxy exclusion settings (see \k{config-proxy-exclude}) do

4
proxy.c
View File

@ -16,9 +16,7 @@
#define do_proxy_dns(cfg) \ #define do_proxy_dns(cfg) \
(cfg->proxy_dns == FORCE_ON || \ (cfg->proxy_dns == FORCE_ON || \
(cfg->proxy_dns == AUTO && \ (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS4))
cfg->proxy_type != PROXY_SOCKS4 && \
cfg->proxy_type != PROXY_SOCKS5))
/* /*
* Call this when proxy negotiation is complete, so that this * Call this when proxy negotiation is complete, so that this