Mercurial > hg > nginx-site
diff xml/en/docs/http/ngx_http_geo_module.xml @ 518:65750bdde8fb
Documented recent changes.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Tue, 15 May 2012 14:57:21 +0000 |
parents | 68d9e5f2ea81 |
children | a8daad8e83bb |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_geo_module.xml +++ b/xml/en/docs/http/ngx_http_geo_module.xml @@ -55,7 +55,7 @@ then the “<literal>255.255.255.255</literal>” address is used. <para> Addresses are specified as CIDR or ranges (0.7.23). -There are also five special parameters: +The following special parameters are also supported: <list type="tag"> <tag-name><literal>delete</literal></tag-name> @@ -79,12 +79,26 @@ There can be several inclusions. <tag-name><literal>proxy</literal></tag-name> <tag-desc> -sets the addresses of proxy servers (0.8.7, 0.7.63). -When a request comes from one of the proxy servers, +defines trusted addresses (0.8.7, 0.7.63). +When a request comes from a trusted address, an address from the <header>X-Forwarded-For</header> request header field will be used instead. -In contrast to the regular addresses, proxy server addresses are +In contrast to the regular addresses, trusted addresses are checked sequentially. +<note> +IPv6 addresses are supported starting from version 1.3.0. +</note> +</tag-desc> + +<tag-name><literal>proxy_recursive</literal></tag-name> +<tag-desc> +enables recursive address search (1.3.0). +If recursive search is disabled then instead of an original client +address that matches one of the trusted addresses, the last +address sent in <header>X-Forwarded-For</header> will be used. +If recursive search is enabled then instead an original client +address that matches one of the trusted addresses, the last +non-trusted address sent in <header>X-Forwarded-For</header> will be used. </tag-desc> <tag-name><literal>ranges</literal></tag-name> @@ -105,6 +119,7 @@ geo $country { include conf/geo.conf; delete 127.0.0.0/16; proxy 192.168.100.0/24; + proxy 2001:0db8::/32; 127.0.0.0/24 US; 127.0.0.1/32 RU;