aboutsummaryrefslogtreecommitdiff
path: root/docs/MANUAL
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-01-25 23:26:25 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-01-25 23:26:25 +0000
commit5aeef9c1c87f2f72f10807a609ced1976ab46cd2 (patch)
tree2989dc65cfaf49acc6e014c256b920dc1e01b95b /docs/MANUAL
parentddd3fe594861e671ea4951371f4a3c0885c3f24f (diff)
- Craig A West brought CURLOPT_NOPROXY and the corresponding --noproxy option.
They basically offer the same thing the NO_PROXY environment variable only offered previously: list a set of host names that shall not use the proxy even if one is specified.
Diffstat (limited to 'docs/MANUAL')
-rw-r--r--docs/MANUAL10
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/MANUAL b/docs/MANUAL
index 3aea5d40f..de2bdd280 100644
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -136,6 +136,11 @@ PROXY
curl -U user:passwd -x my-proxy:888 http://www.get.this/
+ A comma-separated list of hosts and domains which do not use the proxy can
+ be specified as:
+
+ curl --noproxy localhost,get.this -x my-proxy:888 http://www.get.this/
+
curl also supports SOCKS4 and SOCKS5 proxies with --socks4 and --socks5.
See also the environment variables Curl support that offer further proxy
@@ -793,8 +798,9 @@ ENVIRONMENT VARIABLES
NO_PROXY
- If a tail substring of the domain-path for a host matches one of these
- strings, transactions with that node will not be proxied.
+ If the host name matches one of these strings, or the host is within the
+ domain of one of these strings, transactions with that node will not be
+ proxied.
The usage of the -x/--proxy flag overrides the environment variables.