Mercurial > hg > nginx
annotate auto/cc/conf @ 5273:83d028011ae2 stable-1.4
OCSP stapling: fix error logging of successful OCSP responses.
Due to a bad argument list, nginx worker would crash (SIGSEGV) while
trying to log the fact that it received OCSP response with "revoked"
or "unknown" certificate status.
While there, fix similar (but non-crashing) error a few lines above.
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
author | Piotr Sikora <piotr@cloudflare.com> |
---|---|
date | Thu, 16 May 2013 15:37:13 -0700 |
parents | 182aee3b1bf5 |
children | 945aa9c7f282 |
rev | line source |
---|---|
455 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
455 | 4 |
5 | |
487 | 6 LINK="\$(CC)" |
7 | |
455 | 8 ngx_include_opt="-I " |
9 ngx_compile_opt="-c" | |
10 ngx_objout="-o " | |
11 ngx_binout="-o " | |
12 ngx_objext="o" | |
13 ngx_binext= | |
14 | |
573 | 15 ngx_long_start= |
16 ngx_long_end= | |
17 | |
455 | 18 ngx_regex_dirsep="\/" |
19 ngx_dirsep='/' | |
20 | |
21 ngx_regex_cont=' \\\ | |
22 ' | |
23 ngx_cont=' \ | |
24 ' | |
25 ngx_tab=' \ | |
26 ' | |
27 ngx_spacer= | |
28 | |
573 | 29 ngx_long_regex_cont=$ngx_regex_cont |
30 ngx_long_cont=$ngx_cont | |
31 | |
455 | 32 . auto/cc/name |
33 | |
34 if test -n "$CFLAGS"; then | |
35 | |
36 CC_TEST_FLAGS="$CFLAGS $NGX_CC_OPT" | |
37 | |
38 case $NGX_CC_NAME in | |
39 | |
40 ccc) | |
41 # Compaq C V6.5-207 | |
42 | |
43 ngx_include_opt="-I" | |
44 ;; | |
45 | |
46 esac | |
47 | |
48 else | |
49 | |
50 case $NGX_CC_NAME in | |
51 gcc) | |
515 | 52 # gcc 2.7.2.3, 2.8.1, 2.95.4, egcs-1.1.2 |
53 # 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4.0, 3.4.2 | |
561 | 54 # 4.0.0, 4.0.1, 4.1.0 |
455 | 55 |
56 . auto/cc/gcc | |
57 ;; | |
58 | |
4762
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
59 clang) |
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
60 # Clang C compiler |
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
61 |
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
62 . auto/cc/clang |
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
63 ;; |
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
64 |
455 | 65 icc) |
515 | 66 # Intel C++ compiler 7.1, 8.0, 8.1 |
455 | 67 |
68 . auto/cc/icc | |
69 ;; | |
70 | |
561 | 71 sunc) |
72 # Sun C 5.7 Patch 117837-04 2005/05/11 | |
73 | |
74 . auto/cc/sunc | |
75 ;; | |
76 | |
467 | 77 ccc) |
515 | 78 # Compaq C V6.5-207 |
79 | |
80 . auto/cc/ccc | |
467 | 81 ;; |
455 | 82 |
515 | 83 acc) |
84 # aCC: HP ANSI C++ B3910B A.03.55.02 | |
85 | |
86 . auto/cc/acc | |
87 ;; | |
455 | 88 |
461 | 89 msvc*) |
90 # MSVC++ 6.0 SP2, MSVC++ Toolkit 2003 | |
455 | 91 |
92 . auto/cc/msvc | |
93 ;; | |
94 | |
95 owc) | |
96 # Open Watcom C 1.0, 1.2 | |
97 | |
98 . auto/cc/owc | |
99 ;; | |
100 | |
101 bcc) | |
102 # Borland C++ 5.5 | |
103 | |
104 . auto/cc/bcc | |
105 ;; | |
106 | |
107 esac | |
108 | |
515 | 109 CC_TEST_FLAGS="$CC_TEST_FLAGS $NGX_CC_OPT" |
455 | 110 |
111 fi | |
112 | |
113 CFLAGS="$CFLAGS $NGX_CC_OPT" | |
3367
568a854383f9
test invalid --with-ld-opt in right place
Igor Sysoev <igor@sysoev.ru>
parents:
3366
diff
changeset
|
114 NGX_TEST_LD_OPT="$NGX_LD_OPT" |
455 | 115 |
469 | 116 if [ "$NGX_PLATFORM" != win32 ]; then |
455 | 117 |
461 | 118 if test -n "$NGX_LD_OPT"; then |
119 ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\" | |
469 | 120 ngx_feature_name= |
461 | 121 ngx_feature_run=no |
122 ngx_feature_incs= | |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
573
diff
changeset
|
123 ngx_feature_path= |
461 | 124 ngx_feature_libs= |
125 ngx_feature_test= | |
126 . auto/feature | |
127 | |
128 if [ $ngx_found = no ]; then | |
129 echo $0: error: the invalid value in --with-ld-opt=\"$NGX_LD_OPT\" | |
130 echo | |
131 exit 1 | |
132 fi | |
133 fi | |
134 | |
3362
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
135 |
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
136 ngx_feature="gcc builtin atomic operations" |
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
137 ngx_feature_name=NGX_HAVE_GCC_ATOMIC |
3366 | 138 ngx_feature_run=yes |
3362
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
139 ngx_feature_incs= |
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
140 ngx_feature_path= |
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
141 ngx_feature_libs= |
3366 | 142 ngx_feature_test="long n = 0; |
143 if (!__sync_bool_compare_and_swap(&n, 0, 1)) | |
144 return 1; | |
145 if (__sync_fetch_and_add(&n, 1) != 1) | |
146 return 1; | |
147 if (n != 2) | |
148 return 1; | |
149 __sync_synchronize();" | |
3362
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
150 . auto/feature |
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
151 |
b57a4a704f3c
GCC 4.1 builtin atomic operations
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
152 |
517 | 153 if [ "$NGX_CC_NAME" = "ccc" ]; then |
515 | 154 echo "checking for C99 variadic macros ... disabled" |
155 else | |
156 ngx_feature="C99 variadic macros" | |
157 ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" | |
158 ngx_feature_run=yes | |
159 ngx_feature_incs="#include <stdio.h> | |
160 #define var(dummy, ...) sprintf(__VA_ARGS__)" | |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
573
diff
changeset
|
161 ngx_feature_path= |
515 | 162 ngx_feature_libs= |
163 ngx_feature_test="char buf[30]; buf[0] = '0'; | |
164 var(0, buf, \"%d\", 1); | |
165 if (buf[0] != '1') return 1" | |
166 . auto/feature | |
167 fi | |
455 | 168 |
467 | 169 |
3673
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
170 ngx_feature="gcc variadic macros" |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
171 ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
172 ngx_feature_run=yes |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
173 ngx_feature_incs="#include <stdio.h> |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
174 #define var(dummy, args...) sprintf(args)" |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
175 ngx_feature_path= |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
176 ngx_feature_libs= |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
177 ngx_feature_test="char buf[30]; buf[0] = '0'; |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
178 var(0, buf, \"%d\", 1); |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
179 if (buf[0] != '1') return 1" |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
180 . auto/feature |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
181 |
e27070fb6c6b
try to use C99 variadic macros first:
Igor Sysoev <igor@sysoev.ru>
parents:
3367
diff
changeset
|
182 |
467 | 183 # ngx_feature="inline" |
469 | 184 # ngx_feature_name= |
467 | 185 # ngx_feature_run=no |
186 # ngx_feature_incs="int inline f(void) { return 1 }" | |
875
7af8276b1c2f
test PCRE in FreeBSD, Linux, and NetBSD
Igor Sysoev <igor@sysoev.ru>
parents:
573
diff
changeset
|
187 # ngx_feature_path= |
467 | 188 # ngx_feature_libs= |
189 # ngx_feature_test= | |
190 # . auto/feature | |
191 # | |
192 # if [ $ngx_found = yes ]; then | |
193 # fi | |
194 | |
455 | 195 fi |