aboutsummaryrefslogtreecommitdiff
path: root/docs/curl.1
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/curl.1
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/curl.1')
-rw-r--r--docs/curl.19
1 files changed, 8 insertions, 1 deletions
diff --git a/docs/curl.1 b/docs/curl.1
index cd9dba9d2..5b7c111f5 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____|
.\" *
-.\" * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2009, 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
@@ -815,6 +815,13 @@ you to succeed. (Added in 7.16.0)
Note that this is the negated option name documented. You can thus use
\fI--sessionid\fP to enforce session-ID caching.
+.IP "--noproxy <no-proxy-list>"
+Comma-separated list of hosts which do not use a proxy, if one is specified.
+The only wildcard is a single * character, which matches all hosts, and
+effectively disables the proxy. Each name in this list is matched as either
+a domain which contains the hostname, or the hostname itself. For example,
+local.com would match local.com, local.com:80, and www.local.com, but not
+www.notlocal.com.
.IP "--ntlm"
(HTTP) Enables NTLM authentication. The NTLM authentication method was
designed by Microsoft and is used by IIS web servers. It is a proprietary