Browse Source

docs: explain the noproxy CIDR notation support

Follow-up to 1e9a538e05c0107c

Closes #9818
Daniel Stenberg 1 year ago
parent
commit
d4fed2a13a

+ 1 - 0
.github/scripts/spellcheck.words

@@ -92,6 +92,7 @@ chmod
 chown
 chown
 ChromeOS
 ChromeOS
 CI's
 CI's
+CIDR
 CIFS
 CIFS
 CLA
 CLA
 CLAs
 CLAs

+ 5 - 0
docs/cmdline-opts/noproxy.d

@@ -19,3 +19,8 @@ not www.notlocal.com.
 Since 7.53.0, This option overrides the environment variables that disable the
 Since 7.53.0, This option overrides the environment variables that disable the
 proxy ('no_proxy' and 'NO_PROXY'). If there's an environment variable
 proxy ('no_proxy' and 'NO_PROXY'). If there's an environment variable
 disabling a proxy, you can set the noproxy list to "" to override it.
 disabling a proxy, you can set the noproxy list to "" to override it.
+
+Since 7.86.0, IP addresses specified to this option can be provided using CIDR
+notation: an appended slash and number specifies the number of "network bits"
+out of the address to use in the comparison. For example "192.168.0.0/16"
+would match all addresses starting with "192.168".

+ 4 - 3
docs/cmdline-opts/page-footer

@@ -37,9 +37,10 @@ accesses the target URL through the proxy.
 The list of host names can also be include numerical IP addresses, and IPv6
 The list of host names can also be include numerical IP addresses, and IPv6
 versions should then be given without enclosing brackets.
 versions should then be given without enclosing brackets.
 
 
-IPv6 numerical addresses are compared as strings, so they will only match if
-the representations are the same: "::1" is the same as "::0:1" but they do not
-match.
+Since 7.86.0, IP addresses can be specified using CIDR notation: an appended
+slash and number specifies the number of "network bits" out of the address to
+use in the comparison. For example "192.168.0.0/16" would match all addresses
+starting with "192.168".
 .IP "APPDATA <dir>"
 .IP "APPDATA <dir>"
 On Windows, this variable is used when trying to find the home directory. If
 On Windows, this variable is used when trying to find the home directory. If
 the primary home variable are all unset.
 the primary home variable are all unset.

+ 5 - 0
docs/libcurl/opts/CURLOPT_NOPROXY.3

@@ -53,6 +53,11 @@ brackets:
 
 
  "example.com,::1,localhost"
  "example.com,::1,localhost"
 
 
+Since 7.86.0, IP addresses specified to this option can be provided using CIDR
+notation: an appended slash and number specifies the number of "network bits"
+out of the address to use in the comparison. For example "192.168.0.0/16"
+would match all addresses starting with "192.168".
+
 The application does not have to keep the string around after setting this
 The application does not have to keep the string around after setting this
 option.
 option.
 .SH "Environment variables"
 .SH "Environment variables"