Mercurial > hg > nginx-vendor-1-0

annotate auto/lib/geoip/conf @ 626:a7a5fa2e395b NGINX_1_0_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.3 *) Feature: the "auth_basic_user_file" directive supports "$apr1", "{PLAIN}", and "{SSHA}" password encryption methods. Thanks to Maxim Dounin. *) Feature: the "geoip_org" directive and $geoip_org variable. Thanks to Alexander Uskov, Arnaud Granal, and Denis F. Latypoff. *) Feature: ngx_http_geo_module and ngx_http_geoip_module support IPv4 addresses mapped to IPv6 addresses. *) Bugfix: a segmentation fault occurred in a worker process during testing IPv4 address mapped to IPv6 address, if access or deny rules were defined only for IPv6; the bug had appeared in 0.8.22. *) Bugfix: a cached reponse may be broken if proxy/fastcgi/scgi/ uwsgi_cache_bypass and proxy/fastcgi/scgi/uwsgi_no_cache directive values were different; the bug had appeared in 0.8.46.
author Igor Sysoev <http://sysoev.ru>
date Wed, 25 May 2011 00:00:00 +0400
parents 4b0d7f0bf22b
children ad25218fd14b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
508
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5 ngx_feature="GeoIP library"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6 ngx_feature_name=
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7 ngx_feature_run=no
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 ngx_feature_incs=
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 ngx_feature_path=
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 ngx_feature_libs="-lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11 ngx_feature_test="GeoIP_open(NULL, 0)"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 . auto/feature
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 if [ $ngx_found = no ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17 # FreeBSD port
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19 ngx_feature="GeoIP library in /usr/local/"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21 if [ $NGX_RPATH = YES ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22 ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23 else
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 ngx_feature_libs="-L/usr/local/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27 . auto/feature
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 if [ $ngx_found = no ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33 # NetBSD port
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 ngx_feature="GeoIP library in /usr/pkg/"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 ngx_feature_path="/usr/pkg/include/"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 if [ $NGX_RPATH = YES ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39 ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 else
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41 ngx_feature_libs="-L/usr/pkg/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44 . auto/feature
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
47
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 if [ $ngx_found = no ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 # MacPorts
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52 ngx_feature="GeoIP library in /opt/local/"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53 ngx_feature_path="/opt/local/include"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
54
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55 if [ $NGX_RPATH = YES ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56 ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57 else
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58 ngx_feature_libs="-L/opt/local/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61 . auto/feature
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65 if [ $ngx_found = yes ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68 else
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70 cat << END
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
72 $0: error: the GeoIP module requires the GeoIP library.
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73 You can either do not enable the module or install the library.
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
75 END
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77 exit 1
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78 fi