diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-12-16 16:02:08 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-12-16 16:04:23 +0100 |
| commit | 845522cadb6ac9d357d68bb022a148a8c3be2e6a (patch) | |
| tree | 8e49eea5efe813a1d985c8a700025755226a14a3 /docs/libcurl/opts/Makefile.am | |
| parent | 642398c6517bac82d80089ecba9c2057a0752d74 (diff) | |
| download | curl-845522cadb6ac9d357d68bb022a148a8c3be2e6a.tar.gz | |
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.
Diffstat (limited to 'docs/libcurl/opts/Makefile.am')
| -rw-r--r-- | docs/libcurl/opts/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/libcurl/opts/Makefile.am b/docs/libcurl/opts/Makefile.am index 9a9cba1d8..eb7ca1bb5 100644 --- a/docs/libcurl/opts/Makefile.am +++ b/docs/libcurl/opts/Makefile.am @@ -212,6 +212,7 @@ man_MANS = \ CURLOPT_POSTQUOTE.3 \ CURLOPT_POSTREDIR.3 \ CURLOPT_PREQUOTE.3 \ + CURLOPT_PRE_PROXY.3 \ CURLOPT_PRIVATE.3 \ CURLOPT_PROGRESSDATA.3 \ CURLOPT_PROGRESSFUNCTION.3 \ @@ -269,7 +270,6 @@ man_MANS = \ CURLOPT_SOCKOPTFUNCTION.3 \ CURLOPT_SOCKS5_GSSAPI_NEC.3 \ CURLOPT_SOCKS5_GSSAPI_SERVICE.3 \ - CURLOPT_SOCKS_PROXY.3 \ CURLOPT_SSH_AUTH_TYPES.3 \ CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3 \ CURLOPT_SSH_KEYDATA.3 \ @@ -522,6 +522,7 @@ HTMLPAGES = \ CURLOPT_POSTQUOTE.html \ CURLOPT_POSTREDIR.html \ CURLOPT_PREQUOTE.html \ + CURLOPT_PRE_PROXY.html \ CURLOPT_PRIVATE.html \ CURLOPT_PROGRESSDATA.html \ CURLOPT_PROGRESSFUNCTION.html \ @@ -579,7 +580,6 @@ HTMLPAGES = \ CURLOPT_SOCKOPTFUNCTION.html \ CURLOPT_SOCKS5_GSSAPI_NEC.html \ CURLOPT_SOCKS5_GSSAPI_SERVICE.html \ - CURLOPT_SOCKS_PROXY.html \ CURLOPT_SSH_AUTH_TYPES.html \ CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.html \ CURLOPT_SSH_KEYDATA.html \ @@ -832,6 +832,7 @@ PDFPAGES = \ CURLOPT_POSTQUOTE.pdf \ CURLOPT_POSTREDIR.pdf \ CURLOPT_PREQUOTE.pdf \ + CURLOPT_PRE_PROXY.pdf \ CURLOPT_PRIVATE.pdf \ CURLOPT_PROGRESSDATA.pdf \ CURLOPT_PROGRESSFUNCTION.pdf \ @@ -889,7 +890,6 @@ PDFPAGES = \ CURLOPT_SOCKOPTFUNCTION.pdf \ CURLOPT_SOCKS5_GSSAPI_NEC.pdf \ CURLOPT_SOCKS5_GSSAPI_SERVICE.pdf \ - CURLOPT_SOCKS_PROXY.pdf \ CURLOPT_SSH_AUTH_TYPES.pdf \ CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.pdf \ CURLOPT_SSH_KEYDATA.pdf \ |