annotate auto/lib/geoip/conf @ 644:ad25218fd14b NGINX_1_0_12

nginx 1.0.12 *) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the "ssl_protocols" directive. *) Feature: the "if" SSI command supports captures in regular expressions. *) Bugfix: the "if" SSI command did not work inside the "block" command. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "worker_cpu_affinity" directive might not work. *) Bugfix: the "limit_conn_log_level" and "limit_req_log_level" directives might not work. *) Bugfix: the "read_ahead" directive might not work combined with "try_files" and "open_file_cache". *) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter did not return answer from cache if there were no live upstreams. *) Bugfix: a segmentation fault might occur in a worker process if small time was used in the "inactive" parameter of the "proxy_cache_path" directive. *) Bugfix: responses from cache might hang. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in the "epoll" event method. Thanks to Yichun Zhang. *) Bugfix: the $sent_http_cache_control variable might contain a wrong value if the "expires" directive was used. Thanks to Yichun Zhang. *) Bugfix: the "limit_rate" directive did not allow to use full throughput, even if limit value was very high. *) Bugfix: the "sendfile_max_chunk" directive did not work, if the "limit_rate" directive was used. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.0.11. *) Bugfix: in the ngx_http_scgi_module. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Mon, 06 Feb 2012 00:00:00 +0400
parents 4b0d7f0bf22b
children
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
644
ad25218fd14b nginx 1.0.12
Igor Sysoev <http://sysoev.ru>
parents: 508
diff changeset
3 # Copyright (C) Nginx, Inc.
508
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
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6 ngx_feature="GeoIP library"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7 ngx_feature_name=
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 ngx_feature_run=no
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 ngx_feature_incs=
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 ngx_feature_path=
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11 ngx_feature_libs="-lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 ngx_feature_test="GeoIP_open(NULL, 0)"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13 . auto/feature
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
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16 if [ $ngx_found = no ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18 # FreeBSD port
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20 ngx_feature="GeoIP library in /usr/local/"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22 if [ $NGX_RPATH = YES ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23 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
24 else
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 ngx_feature_libs="-L/usr/local/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28 . auto/feature
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 fi
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
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 if [ $ngx_found = no ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34 # NetBSD port
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 ngx_feature="GeoIP library in /usr/pkg/"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 ngx_feature_path="/usr/pkg/include/"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39 if [ $NGX_RPATH = YES ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 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
41 else
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 ngx_feature_libs="-L/usr/pkg/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45 . auto/feature
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46 fi
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
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49 if [ $ngx_found = no ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51 # MacPorts
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53 ngx_feature="GeoIP library in /opt/local/"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
54 ngx_feature_path="/opt/local/include"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56 if [ $NGX_RPATH = YES ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57 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
58 else
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59 ngx_feature_libs="-L/opt/local/lib -lGeoIP"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60 fi
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62 . auto/feature
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63 fi
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
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 if [ $ngx_found = yes ]; then
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69 else
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71 cat << END
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
72
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73 $0: error: the GeoIP module requires the GeoIP library.
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74 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
75
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76 END
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78 exit 1
4b0d7f0bf22b nginx 0.8.6
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
79 fi