From dd97551746dca747c2e624ca81cadb6985199826 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 30 May 2017 18:05:33 +0200 Subject: CURLOPT_PROXY.3: describe the environment variables more --- docs/libcurl/opts/CURLOPT_PROXY.3 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/libcurl/opts/CURLOPT_PROXY.3 b/docs/libcurl/opts/CURLOPT_PROXY.3 index 3398170b0..02de8f4b9 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY.3 +++ b/docs/libcurl/opts/CURLOPT_PROXY.3 @@ -65,10 +65,6 @@ an impact on what other features of the library you can use, such as tunnel through the HTTP proxy. Such tunneling is activated with \fICURLOPT_HTTPPROXYTUNNEL(3)\fP. -libcurl respects the environment variables \fBhttp_proxy\fP, \fBftp_proxy\fP, -\fBall_proxy\fP etc, if any of those are set. The \fICURLOPT_PROXY(3)\fP -option does however override any possibly set environment variables. - Setting the proxy string to "" (an empty string) will explicitly disable the use of a proxy, even if there is an environment variable set for it. @@ -77,6 +73,18 @@ user + password. The application does not have to keep the string around after setting this option. +.SH "Environment variables" +libcurl respects the proxy environment variables named \fBhttp_proxy\fP, +\fBftp_proxy\fP, \fBsftp_proxy\fP etc. If set, libcurl will use the specified +proxy for that URL scheme. So for a "FTP://" URL, the \fBftp_proxy\fP is +considered. \fBall_proxy\fP is used if no protocol specific proxy was set. + +If \fBno_proxy\fP (or \fBNO_PROXY\fP) is set, it can specify a list of host +names to not use a proxy for (even if one of the previous mention variables +are set). That is the exact equivalent of setting the \fBCURLOPT_NOPROXY(3)\fP +option. + +The \fICURLOPT_PROXY(3)\fP option overrides environment variables. .SH DEFAULT Default is NULL, meaning no proxy is used. -- cgit v1.2.3