Fixes issue #3863 #4229
Merged
Fixes issue #3863 #4229
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
How tests are failing for Python 3.3. I have only changed one .rst on the docs |
Lukasa
requested changes
Aug 9, 2017
docs/user/advanced.rst
Outdated
| @@ -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. | |||
There was a problem hiding this comment.
Let's change this to:
Using the scheme
socks5causes 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, usesocks5has the scheme.
|
I update the docs accordingly. |
Lukasa
requested changes
Aug 9, 2017
docs/user/advanced.rst
Outdated
| @@ -593,6 +593,8 @@ 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. | |||
There was a problem hiding this comment.
Can we surround socks and socks5 with double-backticks? That is, make it:
``socks``
There was a problem hiding this comment.
Do you mean socks5 and socks5h right?
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update the docs for issue #3863 .