aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-05-30 22:43:34 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-05-30 22:43:34 +0200
commit2d5fa35e85c6e0ba84e6922e321bbe3a4511cdf9 (patch)
treef40300714e74e3b19d5297047250f7a26c9ab76e
parentdd97551746dca747c2e624ca81cadb6985199826 (diff)
docs: clarify NO_PROXY further
Fixes #1208
-rw-r--r--docs/MANUAL7
-rw-r--r--docs/libcurl/opts/CURLOPT_NOPROXY.36
2 files changed, 10 insertions, 3 deletions
diff --git a/docs/MANUAL b/docs/MANUAL
index 330f99aea..0e3db0ffb 100644
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -866,8 +866,11 @@ ENVIRONMENT VARIABLES
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.
-
+ proxied. When a domain is used, it needs to start with a period. A user can
+ specify that both www.example.com and foo.example.com should not uses a
+ proxy by setting NO_PROXY to ".example.com". By including the full name you
+ can exclude specific host names, so to make www.example.com not use a proxy
+ but still have foo.example.com do it, set NO_PROXY to "www.example.com"
The usage of the -x/--proxy flag overrides the environment variables.
diff --git a/docs/libcurl/opts/CURLOPT_NOPROXY.3 b/docs/libcurl/opts/CURLOPT_NOPROXY.3
index 1048b55a3..a969dc5c2 100644
--- a/docs/libcurl/opts/CURLOPT_NOPROXY.3
+++ b/docs/libcurl/opts/CURLOPT_NOPROXY.3
@@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____|
.\" *
-.\" * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2017, 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
@@ -37,6 +37,10 @@ hostname itself. For example, example.com would match example.com,
example.com:80, and www.example.com, but not www.notanexample.com or
example.com.othertld.
+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".
+
The application does not have to keep the string around after setting this
option.
.SH DEFAULT