Mercurial > hg > nginx
annotate docs/GNUmakefile @ 4668:ba2c7463ce18 stable-1.2
Merge of r4614, r4624-r4629, r4631: proxy recursive changes.
*) Added IPv6 and UNIX-domain socket support in "debug_connection"
directive.
*) New function ngx_http_get_forwarded_addr() to look up real client
address.
On input it takes an original address, string in the X-Forwarded-For format
and its length, list of trusted proxies, and a flag indicating to perform
the recursive search. On output it returns NGX_OK and the "deepest" valid
address in a chain, or NGX_DECLINED. It supports AF_INET and AF_INET6.
Additionally, original address and/or proxy may be specified as AF_UNIX.
*) Realip: chains of trusted proxies and IPv6 support.
The module now supports recursive search of client address through
the chain of trusted proxies, controlled by the "real_ip_recursive"
directive (closes #2). It also gets full IPv6 support (closes #44)
and canonical value of the $client_addr variable on address change.
Example:
real_ip_header X-Forwarded-For;
set_real_ip_from 127.0.0.0/8;
set_real_ip_from ::1;
set_real_ip_from unix:;
real_ip_recursive on;
*) Geo: chains of trusted proxies and partial IPv6 support.
The module now supports recursive search of client address through
the chain of trusted proxies, controlled by the "proxy_recursive"
directive in the "geo" block. It also gets partial IPv6 support:
now proxies may be specified with IPv6 addresses.
Example:
geo $test {
...
proxy 127.0.0.1;
proxy ::1;
proxy_recursive;
}
There's also a slight change in behavior. When original client
address (as specified by the "geo" directive) is one of the
trusted proxies, and the value of the X-Forwarded-For request
header cannot not be parsed as a valid address, an original client
address will be used for lookup. Previously, 255.255.255.255 was
used in this case.
*) Geoip: trusted proxies support and partial IPv6 support.
The module now supports recursive search of client address through the
chain of trusted proxies (closes #100), in the same scope as the geo
module. Proxies are listed by the "geoip_proxy" directive, recursive
search is enabled by the "geoip_proxy_recursive" directive. IPv6 is
partially supported: proxies may be specified with IPv6 addresses.
Example:
geoip_country .../GeoIP.dat;
geoip_proxy 127.0.0.1;
geoip_proxy ::1;
geoip_proxy 10.0.0.0/8;
geoip_proxy_recursive on;
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 04 Jun 2012 11:58:12 +0000 |
parents | b9dade63fcc2 |
children | 3032f4854b81 0275f587e00b |
rev | line source |
---|---|
681 | 1 |
775 | 2 VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ |
3 | sed -e 's/^.*\"\(.*\)\"/\1/') | |
681 | 4 NGINX= nginx-$(VER) |
5 TEMP= tmp | |
6 CP= $(HOME)/java | |
7 | |
8 define XSLScript | |
3995
3ce6b8cedcb9
update documentation build procedure
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
9 java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \ |
681 | 10 com.pault.StyleSheet \ |
11 -x com.pault.XX -y com.pault.XX \ | |
3995
3ce6b8cedcb9
update documentation build procedure
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
12 $(1) docs/xsls/dump.xsls \ |
3997 | 13 | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2) |
681 | 14 |
15 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2) | |
16 endef | |
17 | |
18 define XSLT | |
3999
36ce2e430bdd
Don't ignore xmllint errors.
Ruslan Ermilov <ru@nginx.com>
parents:
3997
diff
changeset
|
19 xmllint --noout --valid $2 |
3995
3ce6b8cedcb9
update documentation build procedure
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
20 xsltproc -o $3 \ |
3ce6b8cedcb9
update documentation build procedure
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
21 $(shell echo $4 \\ |
681 | 22 | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \ |
3995
3ce6b8cedcb9
update documentation build procedure
Igor Sysoev <igor@sysoev.ru>
parents:
2065
diff
changeset
|
23 $1 $2 |
681 | 24 endef |
25 | |
26 | |
4187
b9dade63fcc2
The reference documentation is moving elsewhere.
Ruslan Ermilov <ru@nginx.com>
parents:
4110
diff
changeset
|
27 all: changes |
4068
22364b1f61c9
Initial English translation of Core and HTTP Core modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4013
diff
changeset
|
28 |
681 | 29 changes: $(TEMP)/$(NGINX)/CHANGES.ru \ |
30 $(TEMP)/$(NGINX)/CHANGES | |
31 | |
32 | |
33 $(TEMP)/$(NGINX)/CHANGES.ru: docs/xml/nginx/changes.xml \ | |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
34 docs/xml/change_log_conf.xml \ |
681 | 35 docs/xslt/changes.xslt |
36 | |
37 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) | |
38 | |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
39 xsltproc --stringparam lang ru \ |
681 | 40 -o $(TEMP)/$(NGINX)/CHANGES.ru \ |
41 docs/xslt/changes.xslt docs/xml/nginx/changes.xml | |
42 | |
43 | |
44 $(TEMP)/$(NGINX)/CHANGES: docs/xml/nginx/changes.xml \ | |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
45 docs/xml/change_log_conf.xml \ |
681 | 46 docs/xslt/changes.xslt |
47 | |
2065 | 48 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) |
681 | 49 |
4013
b427290fb6bc
- Added missing dependencies for the CHANGES{,ru} targets.
Ruslan Ermilov <ru@nginx.com>
parents:
3999
diff
changeset
|
50 xsltproc --stringparam lang en \ |
681 | 51 -o $(TEMP)/$(NGINX)/CHANGES \ |
52 docs/xslt/changes.xslt docs/xml/nginx/changes.xml | |
53 | |
54 | |
55 docs/xslt/changes.xslt: docs/xsls/changes.xsls | |
56 | |
57 $(call XSLScript, docs/xsls/changes.xsls, $@) |