annotate auto/os/conf @ 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 0b6053502c55
children 981b4c44593b
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: 390
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
112
408f195b3482 nginx 0.3.3
Igor Sysoev <http://sysoev.ru>
parents: 66
diff changeset
6 echo "checking for $NGX_SYSTEM specific features"
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
42
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
8 case "$NGX_PLATFORM" in
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9
232
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
10 FreeBSD:*)
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11 . auto/os/freebsd
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 Linux:*)
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 . auto/os/linux
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18 SunOS:*)
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19 . auto/os/solaris
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21
390
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents: 270
diff changeset
22 Darwin:*)
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents: 270
diff changeset
23 . auto/os/darwin
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents: 270
diff changeset
24 ;;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents: 270
diff changeset
25
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 win32)
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
27 . auto/os/win32
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29
232
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
30 DragonFly:*)
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
31 have=NGX_FREEBSD . auto/have_headers
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
32 CORE_INCS="$UNIX_INCS"
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
33 CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS"
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
34 CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS"
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
35
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
36 echo " + sendfile() found"
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
37 have=NGX_HAVE_SENDFILE . auto/have
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
38 CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS"
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
39
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
40 ngx_spacer='
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
41 '
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
42 ;;
d8f5c91a5c07 nginx 0.4.1
Igor Sysoev <http://sysoev.ru>
parents: 142
diff changeset
43
64
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
44 HP-UX:*)
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
45 # HP/UX
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
46 have=NGX_HPUX . auto/have_headers
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
47 CORE_INCS="$UNIX_INCS"
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
48 CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
49 CORE_SRCS="$UNIX_SRCS"
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
50 CC_AUX_FLAGS="$CC_AUX_FLAGS -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
51 ;;
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
52
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
53 OSF1:*)
66
818201e5a553 nginx 0.1.33
Igor Sysoev <http://sysoev.ru>
parents: 64
diff changeset
54 # Tru64 UNIX
64
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
55 have=NGX_TRU64 . auto/have_headers
66
818201e5a553 nginx 0.1.33
Igor Sysoev <http://sysoev.ru>
parents: 64
diff changeset
56 have=NGX_HAVE_STRERROR_R . auto/nohave
64
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
57 CORE_INCS="$UNIX_INCS"
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
58 CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
59 CORE_SRCS="$UNIX_SRCS"
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
60 ;;
5db440287648 nginx 0.1.32
Igor Sysoev <http://sysoev.ru>
parents: 58
diff changeset
61
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62 *)
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63 CORE_INCS="$UNIX_INCS"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64 CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65 CORE_SRCS="$UNIX_SRCS"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68 esac
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
69
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
70
42
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 38
diff changeset
71 case "$NGX_MACHINE" in
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
72
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
73 i386 | i686 | i86pc)
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
74 have=NGX_HAVE_NONALIGNED . auto/have
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
75 NGX_MACH_CACHE_LINE=32
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
76 ;;
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
77
142
84910468f6de nginx 0.3.18
Igor Sysoev <http://sysoev.ru>
parents: 138
diff changeset
78 amd64 | x86_64)
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
79 have=NGX_HAVE_NONALIGNED . auto/have
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
80 NGX_MACH_CACHE_LINE=64
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
81 ;;
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
82
242
ff906029dd40 nginx 0.4.6
Igor Sysoev <http://sysoev.ru>
parents: 232
diff changeset
83 sun4u | sun4v | sparc | sparc64)
130
82d695e3d662 nginx 0.3.12
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
84 have=NGX_ALIGNMENT value=16 . auto/define
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
85 # TODO
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
86 NGX_MACH_CACHE_LINE=64
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
87 ;;
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
88
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
89 ia64 )
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
90 have=NGX_ALIGNMENT value=16 . auto/define
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
91 # TODO
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
92 NGX_MACH_CACHE_LINE=64
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
93 ;;
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
94
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
95 *)
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
96 NGX_MACH_CACHE_LINE=32
130
82d695e3d662 nginx 0.3.12
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
97 ;;
82d695e3d662 nginx 0.3.12
Igor Sysoev <http://sysoev.ru>
parents: 112
diff changeset
98
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
99 esac
138
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
100
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
101 if test -z "$NGX_CPU_CACHE_LINE"; then
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
102 NGX_CPU_CACHE_LINE=$NGX_MACH_CACHE_LINE
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
103 fi
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
104
8e6d4d96ec4c nginx 0.3.16
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
105 have=NGX_CPU_CACHE_LINE value=$NGX_CPU_CACHE_LINE . auto/define