summaryrefslogtreecommitdiff
path: root/docs/cmdline-opts/preproxy.d
Commit message (Collapse)AuthorAgeFilesLines
* cmdline-opts/socks*: Mention --preproxy in --socks* optsJay Satiro2017-02-091-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_PROXYDaniel Stenberg2016-12-161-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.