From 963c78853f0125eb21f3483628f34ab322d65b34 Mon Sep 17 00:00:00 2001 From: Nikolaos Vlagoidis Date: Wed, 9 Aug 2017 15:38:45 +0300 Subject: [PATCH 1/3] Fixes issue #3863 --- docs/user/advanced.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst index a1b68707..11ee4e3f 100644 --- a/docs/user/advanced.rst +++ b/docs/user/advanced.rst @@ -593,6 +593,10 @@ as using a HTTP one:: 'https': 'socks5://user:pass@host:port' } +Using socks5 proxy resolve domains through the client instead of the proxy server. This is done to be +in line with curl, which uses different schemes to decide whether to resolve via the proxy or via the client. +You need to use the scheme socks5h is you want to resolve domains through the proxy server. + .. _compliance: Compliance From cb9620780ff6c69b88ec0400d3fd140e28a7aec2 Mon Sep 17 00:00:00 2001 From: NikosVlagoidis Date: Wed, 9 Aug 2017 18:52:26 +0300 Subject: [PATCH 2/3] Update advanced.rst --- docs/user/advanced.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst index 11ee4e3f..742fa4cd 100644 --- a/docs/user/advanced.rst +++ b/docs/user/advanced.rst @@ -593,9 +593,7 @@ as using a HTTP one:: 'https': 'socks5://user:pass@host:port' } -Using socks5 proxy resolve domains through the client instead of the proxy server. This is done to be -in line with curl, which uses different schemes to decide whether to resolve via the proxy or via the client. -You need to use the scheme socks5h is you want to resolve domains through the proxy server. +Using the scheme socks5 causes the DNS resolution to happen on the client, rather than on the proxy server. This is in line with curl, which uses the scheme to decide whether to do the DNS resolution on the client or proxy. If you want to resolve the domains on the proxy server, use socks5h as the scheme. .. _compliance: From 218978601f2ab711ec83e5bd18d439d2c2970efc Mon Sep 17 00:00:00 2001 From: NikosVlagoidis Date: Wed, 9 Aug 2017 20:18:43 +0300 Subject: [PATCH 3/3] Fix issue #3863 --- docs/user/advanced.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst index 742fa4cd..4aa1dfac 100644 --- a/docs/user/advanced.rst +++ b/docs/user/advanced.rst @@ -593,7 +593,7 @@ as using a HTTP one:: 'https': 'socks5://user:pass@host:port' } -Using the scheme socks5 causes the DNS resolution to happen on the client, rather than on the proxy server. This is in line with curl, which uses the scheme to decide whether to do the DNS resolution on the client or proxy. If you want to resolve the domains on the proxy server, use socks5h as the scheme. +Using the scheme ``socks5`` causes the DNS resolution to happen on the client, rather than on the proxy server. This is in line with curl, which uses the scheme to decide whether to do the DNS resolution on the client or proxy. If you want to resolve the domains on the proxy server, use ``socks5h`` as the scheme. .. _compliance: