Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cmdline-opts/socks*: Mention --preproxy in --socks* opts | Jay Satiro | 2017-02-09 | 1 | -2/+3 |
| | | | | | | | | | | - Document in --socks* opts they're still mutually exclusive of --proxy. Partial revert of 423a93c; I had misinterpreted the SOCKS proxy + HTTP/HTTPS proxy combination. - Document in --socks* opts that --preproxy can be used to specify a SOCKS proxy at the same time --proxy is used with an HTTP/HTTPS proxy. | ||||
* | preproxy: renamed what was added as SOCKS_PROXY | Daniel Stenberg | 2016-12-16 | 1 | -0/+21 |
CURLOPT_SOCKS_PROXY -> CURLOPT_PRE_PROXY Added the corresponding --preroxy command line option. Sets a SOCKS proxy to connect to _before_ connecting to a HTTP(S) proxy. |