annotate auto/summary @ 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 f200748c0ac8
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: 648
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
92
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
6 ### STUB
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
7
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
8 if [ $USE_THREADS != NO ]; then
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
9
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
10 cat << END
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
11
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
12 $0: error: the threads support is broken now.
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
13
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
14 END
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
15 exit 1
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
16 fi
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
17
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
18 ###
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
19
45945fa8b8ba nginx 0.2.0
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
20
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21 echo
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22 echo "Configuration summary"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24
372
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
25 #case $USE_THREADS in
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
26 # rfork) echo " + using rfork()ed threads" ;;
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
27 # pthreads) echo " + using libpthread threads library" ;;
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
28 # libthr) echo " + using FreeBSD libthr threads library" ;;
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
29 # libc_r) echo " + using FreeBSD libc_r threads library" ;;
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
30 # linuxthreads) echo " + using FreeBSD LinuxThreads port library" ;;
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
31 # NO) echo " + threads are not used" ;;
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
32 # *) echo " + using lib$USE_THREADS threads library" ;;
6639b93e81b2 nginx 0.6.30
Igor Sysoev <http://sysoev.ru>
parents: 324
diff changeset
33 #esac
6
80ba094c6b3e nginx 0.1.3
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
34
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 if [ $USE_PCRE = DISABLED ]; then
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
36 echo " + PCRE library is disabled"
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 else
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39 case $PCRE in
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 YES) echo " + using system PCRE library" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41 NONE) echo " + PCRE library is not used" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 *) echo " + using PCRE library: $PCRE" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 esac
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44 fi
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46 case $OPENSSL in
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
47 YES) echo " + using system OpenSSL library" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 NONE) echo " + OpenSSL library is not used" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49 *) echo " + using OpenSSL library: $OPENSSL" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 esac
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51
26
45fe5b98a9de nginx 0.1.13
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
52 case $MD5 in
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 372
diff changeset
53 YES) echo " + md5: using $MD5_LIB library" ;;
26
45fe5b98a9de nginx 0.1.13
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
54 NONE) echo " + md5 library is not used" ;;
622
8dc007eddbcf nginx 1.0.1
Igor Sysoev <http://sysoev.ru>
parents: 586
diff changeset
55 NO) echo " + using builtin md5 code" ;;
26
45fe5b98a9de nginx 0.1.13
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
56 *) echo " + using md5 library: $MD5" ;;
45fe5b98a9de nginx 0.1.13
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
57 esac
45fe5b98a9de nginx 0.1.13
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
58
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents: 92
diff changeset
59 case $SHA1 in
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 372
diff changeset
60 YES) echo " + sha1: using $SHA1_LIB library" ;;
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents: 92
diff changeset
61 NONE) echo " + sha1 library is not used" ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents: 92
diff changeset
62 NO) echo " + sha1 library is not found" ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents: 92
diff changeset
63 *) echo " + using sha1 library: $SHA1" ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents: 92
diff changeset
64 esac
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents: 92
diff changeset
65
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 case $ZLIB in
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67 YES) echo " + using system zlib library" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68 NONE) echo " + zlib library is not used" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69 *) echo " + using zlib library: $ZLIB" ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70 esac
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71
556
25255878df91 nginx 0.8.30
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
72 case $NGX_LIBATOMIC in
25255878df91 nginx 0.8.30
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
73 YES) echo " + using system libatomic_ops library" ;;
25255878df91 nginx 0.8.30
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
74 NO) ;; # not used
25255878df91 nginx 0.8.30
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
75 *) echo " + using libatomic_ops library: $NGX_LIBATOMIC" ;;
25255878df91 nginx 0.8.30
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
76 esac
25255878df91 nginx 0.8.30
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
77
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78 echo
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
79
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
80
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
81 cat << END
42
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
82 nginx path prefix: "$NGX_PREFIX"
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
83 nginx binary file: "$NGX_SBIN_PATH"
324
f7cd062ee035 nginx 0.6.6
Igor Sysoev <http://sysoev.ru>
parents: 202
diff changeset
84 nginx configuration prefix: "$NGX_CONF_PREFIX"
42
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
85 nginx configuration file: "$NGX_CONF_PATH"
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
86 nginx pid file: "$NGX_PID_PATH"
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
87 END
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
88
18
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 6
diff changeset
89 if test -n "$NGX_ERROR_LOG_PATH"; then
42
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
90 echo " nginx error log file: \"$NGX_ERROR_LOG_PATH\""
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
91 else
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
92 echo " nginx logs errors to stderr"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
93 fi
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
94
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
95 cat << END
42
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
96 nginx http access log file: "$NGX_HTTP_LOG_PATH"
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
97 nginx http client request body temporary files: "$NGX_HTTP_CLIENT_TEMP_PATH"
576
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
98 END
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
99
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
100 if [ $HTTP_PROXY = YES ]; then
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
101 echo " nginx http proxy temporary files: \"$NGX_HTTP_PROXY_TEMP_PATH\""
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
102 fi
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
103
576
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
104 if [ $HTTP_FASTCGI = YES ]; then
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
105 echo " nginx http fastcgi temporary files: \"$NGX_HTTP_FASTCGI_TEMP_PATH\""
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
106 fi
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
107
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
108 if [ $HTTP_UWSGI = YES ]; then
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
109 echo " nginx http uwsgi temporary files: \"$NGX_HTTP_UWSGI_TEMP_PATH\""
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
110 fi
01f2313e34f1 nginx 0.8.40
Igor Sysoev <http://sysoev.ru>
parents: 556
diff changeset
111
580
4d3e880ce86c nginx 0.8.42
Igor Sysoev <http://sysoev.ru>
parents: 576
diff changeset
112 if [ $HTTP_SCGI = YES ]; then
4d3e880ce86c nginx 0.8.42
Igor Sysoev <http://sysoev.ru>
parents: 576
diff changeset
113 echo " nginx http scgi temporary files: \"$NGX_HTTP_SCGI_TEMP_PATH\""
4d3e880ce86c nginx 0.8.42
Igor Sysoev <http://sysoev.ru>
parents: 576
diff changeset
114 fi
648
f200748c0ac8 nginx 1.1.8
Igor Sysoev <http://sysoev.ru>
parents: 622
diff changeset
115
f200748c0ac8 nginx 1.1.8
Igor Sysoev <http://sysoev.ru>
parents: 622
diff changeset
116 echo "$NGX_POST_CONF_MSG"