moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity
22,756 Commits 10 Branches 144 Tags 113 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Jay Satiro 7017c421a1 cmdline-opts/socks*: Mention --preproxy in --socks* opts 
- 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.
 2017-02-09 18:26:16 -05:00
Daniel Stenberg 845522cadb preproxy: renamed what was added as SOCKS_PROXY 
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.
 2016-12-16 16:04:23 +01:00