diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-08-24 09:30:47 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-08-24 23:22:46 +0200 |
| commit | a7ba60bb725088cc650bbb636c06a78715568663 (patch) | |
| tree | d0799b108e67ea301c68072ef3ce847a77fc0a5e /docs/libcurl/opts | |
| parent | 20168b948abc4b6420d811f7a9526211e102f1f3 (diff) | |
docs: clarify NO_PROXY env variable functionality
Reported-by: Kirill Marchuk
Fixes #2773
Closes #2911
Diffstat (limited to 'docs/libcurl/opts')
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_NOPROXY.3 | 4 | ||||
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_PROXY.3 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/libcurl/opts/CURLOPT_NOPROXY.3 b/docs/libcurl/opts/CURLOPT_NOPROXY.3 index 8ca0580a2..0d3ce229c 100644 --- a/docs/libcurl/opts/CURLOPT_NOPROXY.3 +++ b/docs/libcurl/opts/CURLOPT_NOPROXY.3 @@ -52,7 +52,9 @@ brackets: The application does not have to keep the string around after setting this option. .SH "Environment variables" -See \fICURLOPT_PROXY(3)\fP +If there's an environment variable called \fBno_proxy\fP (or \fBNO_PROXY\fP), +it will be used if the \fICURLOPT_NOPROXY(3)\fP option is not set. It works +exactly the same way. .SH DEFAULT NULL .SH PROTOCOLS diff --git a/docs/libcurl/opts/CURLOPT_PROXY.3 b/docs/libcurl/opts/CURLOPT_PROXY.3 index ca7ae6936..97818e920 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY.3 +++ b/docs/libcurl/opts/CURLOPT_PROXY.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -79,10 +79,8 @@ libcurl respects the proxy environment variables named \fBhttp_proxy\fP, 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 \fICURLOPT_NOPROXY(3)\fP -option. +If \fBno_proxy\fP (or \fBNO_PROXY\fP) is set, it is the exact equivalent of +setting the \fICURLOPT_NOPROXY(3)\fP option. The \fICURLOPT_PROXY(3)\fP and \fICURLOPT_NOPROXY(3)\fP options override environment variables. |