Commit 46d63bbb authored Sep 24, 2017 by Michael Kaufmann

docs: clarify the use of environment variables for proxy

Closes #1921

parent eac324f2

docs/libcurl/opts/CURLOPT_NOPROXY.3

+5 −0

Original line number	Diff line number	Diff line
		@@ -41,8 +41,13 @@ If the name in the noproxy list has a leading period, it is a domain match
		against the provided host name. This way ".example.com" will switch off proxy
		use for both "www.example.com" as well as for "foo.example.com".

		Setting the noproxy string to "" (an empty string) will explicitly enable the
		proxy for all host names, even if there is an environment variable set for it.

		The application does not have to keep the string around after setting this
		option.
		.SH "Environment variables"
		See \fICURLOPT_PROXY(3)\fP
		.SH DEFAULT
		NULL
		.SH PROTOCOLS

docs/libcurl/opts/CURLOPT_PROXY.3

+2 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,8 @@ 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.

		The \fICURLOPT_PROXY(3)\fP option overrides environment variables.
		The \fICURLOPT_PROXY(3)\fP and \fICURLOPT_NOPROXY(3)\fP options override
		environment variables.
		.SH DEFAULT
		Default is NULL, meaning no proxy is used.