annotate auto/feature @ 660:d0f7a625f27c NGINX_1_1_14

nginx 1.1.14 *) Feature: multiple "limit_req" limits may be used simultaneously. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "proxy_redirect" directives might not be correctly inherited. *) Bugfix: memory leak during reconfiguration if the "pcre_jit" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Jan 2012 00:00:00 +0400
parents a7a5fa2e395b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
660
d0f7a625f27c nginx 1.1.14
Igor Sysoev <http://sysoev.ru>
parents: 626
diff changeset
3 # Copyright (C) Nginx, Inc.
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
6 echo $ngx_n "checking for $ngx_feature ...$ngx_c"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
7
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
8 cat << END >> $NGX_AUTOCONF_ERR
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
9
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
10 ----------------------------------------
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
11 checking for $ngx_feature
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
12
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
13 END
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 ngx_found=no
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
17 if test -n "$ngx_feature_name"; then
194
003bd800ec2a nginx 0.3.44
Igor Sysoev <http://sysoev.ru>
parents: 168
diff changeset
18 ngx_have_feature=`echo $ngx_feature_name \
003bd800ec2a nginx 0.3.44
Igor Sysoev <http://sysoev.ru>
parents: 168
diff changeset
19 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
20 fi
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21
258
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 236
diff changeset
22 if test -n "$ngx_feature_path"; then
392
34fb3a573548 nginx 0.7.8
Igor Sysoev <http://sysoev.ru>
parents: 270
diff changeset
23 for ngx_temp in $ngx_feature_path; do
34fb3a573548 nginx 0.7.8
Igor Sysoev <http://sysoev.ru>
parents: 270
diff changeset
24 ngx_feature_inc_path="$ngx_feature_inc_path -I $ngx_temp"
34fb3a573548 nginx 0.7.8
Igor Sysoev <http://sysoev.ru>
parents: 270
diff changeset
25 done
258
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 236
diff changeset
26 fi
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 236
diff changeset
27
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28 cat << END > $NGX_AUTOTEST.c
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 #include <sys/types.h>
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
31 $NGX_INCLUDE_UNISTD_H
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
32 $ngx_feature_incs
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34 int main() {
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 $ngx_feature_test;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 return 0;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39 END
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
41
258
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 236
diff changeset
42 ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \
554
5c576ea5dbd9 nginx 0.8.29
Igor Sysoev <http://sysoev.ru>
parents: 392
diff changeset
43 -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_TEST_LD_OPT $ngx_feature_libs"
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
44
258
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 236
diff changeset
45 ngx_feature_inc_path=
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 236
diff changeset
46
270
6eb1e38f0f1f nginx 0.5.5
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
47 eval "/bin/sh -c \"$ngx_test\" >> $NGX_AUTOCONF_ERR 2>&1"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
48
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 if [ -x $NGX_AUTOTEST ]; then
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
52 case "$ngx_feature_run" in
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
53
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
54 yes)
236
c982febb7588 nginx 0.4.3
Igor Sysoev <http://sysoev.ru>
parents: 194
diff changeset
55 # /bin/sh is used to intercept "Killed" or "Abort trap" messages
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 604
diff changeset
56 if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
57 echo " found"
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
58 ngx_found=yes
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
59
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
60 if test -n "$ngx_feature_name"; then
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
61 have=$ngx_have_feature . auto/have
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
62 fi
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
63
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
64 else
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
65 echo " found but is not working"
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
66 fi
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
67 ;;
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
68
604
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
69 value)
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
70 # /bin/sh is used to intercept "Killed" or "Abort trap" messages
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 604
diff changeset
71 if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
604
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
72 echo " found"
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
73 ngx_found=yes
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
74
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
75 cat << END >> $NGX_AUTO_CONFIG_H
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
76
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
77 #ifndef $ngx_feature_name
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
78 #define $ngx_feature_name `$NGX_AUTOTEST`
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
79 #endif
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
80
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
81 END
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
82 else
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
83 echo " found but is not working"
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
84 fi
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
85 ;;
428c6e58046a nginx 0.9.0
Igor Sysoev <http://sysoev.ru>
parents: 554
diff changeset
86
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
87 bug)
236
c982febb7588 nginx 0.4.3
Igor Sysoev <http://sysoev.ru>
parents: 194
diff changeset
88 # /bin/sh is used to intercept "Killed" or "Abort trap" messages
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 604
diff changeset
89 if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
90 echo " not found"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
91
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
92 else
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
93 echo " found"
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
94 ngx_found=yes
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
95
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
96 if test -n "$ngx_feature_name"; then
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
97 have=$ngx_have_feature . auto/have
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
98 fi
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
99 fi
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
100 ;;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
101
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
102 *)
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
103 echo " found"
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
104 ngx_found=yes
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
105
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
106 if test -n "$ngx_feature_name"; then
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
107 have=$ngx_have_feature . auto/have
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
108 fi
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
109 ;;
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
110
168
3314be145cb9 nginx 0.3.31
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
111 esac
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
112
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
113 else
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
114 echo " not found"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
115
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
116 echo "----------" >> $NGX_AUTOCONF_ERR
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
117 cat $NGX_AUTOTEST.c >> $NGX_AUTOCONF_ERR
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
118 echo "----------" >> $NGX_AUTOCONF_ERR
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
119 echo $ngx_test >> $NGX_AUTOCONF_ERR
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
120 echo "----------" >> $NGX_AUTOCONF_ERR
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
121 fi
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
122
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
123 rm $NGX_AUTOTEST*