annotate auto/cc/icc @ 104:146eff53ab60 NGINX_0_2_6

nginx 0.2.6 *) Change: while using load-balancing the time before the failed backend retry was decreased from 60 to 10 seconds. *) Change: the "proxy_pass_unparsed_uri" was canceled, the original URI now passed, if the URI part is omitted in "proxy_pass" directive. *) Feature: the "error_page" directive supports redirects and allows more flexible to change an error code. *) Change: the charset in the "Content-Type" header line now is ignored in proxied subrequests. *) Bugfix: if the URI was changed in the "if" block and request did not found new configuration, then the ngx_http_rewrite_module rules ran again. *) Bugfix: if the "set" directive set the ngx_http_geo_module variable in some configuration part, the this variable was not available in other configuration parts and the "using uninitialized variable" error was occurred; bug appeared in 0.2.2.
author Igor Sysoev <http://sysoev.ru>
date Wed, 05 Oct 2005 00:00:00 +0400
parents b31656313b59
children 45f7329b4bd0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
42
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 36
diff changeset
5 # Intel C++ compiler 7.1, 8.0, 8.1
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
7 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
8 | sed -e 's/^.* Version \(.*\) Build.*$/\1/'`
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
9
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
10 echo " + icc version: $NGX_ICC_VER"
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
11
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
12
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13 # optimizations
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 CFLAGS="$CFLAGS -O"
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
16 # inline the functions declared with __inline
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17 #CFLAGS="$CFLAGS -Ob1"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18 # inline any function, at the compiler's discretion
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19 CFLAGS="$CFLAGS -Ob2"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21 # single-file IP optimizations
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22 #IPO="-ip"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23 # multi-file IP optimizations
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 IPO="-ipo -ipo_obj"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 CFLAGS="$CFLAGS $IPO"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 CORE_LINK="$CORE_LINK $IPO"
18
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
27 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 case $CPU in
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 pentium)
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 # optimize for Pentium and Athlon
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 CPU_OPT="-march=pentium"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33 ;;
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 pentiumpro)
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 # optimize for Pentium Pro, Pentium II and Pentium III
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 CPU_OPT="-mcpu=pentiumpro -march=pentiumpro"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 ;;
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 pentium4)
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41 # optimize for Pentium 4, default
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 CPU_OPT="-march=pentium4"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 ;;
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44 esac
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46 CFLAGS="$CFLAGS $CPU_OPT"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
47
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 if [ ".$PCRE_OPT" = "." ]; then
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49 PCRE_OPT="-O $IPO $CPU_OPT"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 fi
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52 if [ ".$MD5_OPT" = "." ]; then
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53 MD5_OPT="-O $IPO $CPU_OPT"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
54 fi
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56 if [ ".$ZLIB_OPT" = "." ]; then
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57 ZLIB_OPT="-O $IPO $CPU_OPT"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58 fi
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61 # warnings
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
63 CFLAGS="$CFLAGS -w2"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
64
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
65 # disable some warnings
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
67 # invalid type conversion: "int" to "char *"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
68 CFLAGS="$CFLAGS -wd171"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
69 # argument is incompatible with corresponding format string conversion
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
70 CFLAGS="$CFLAGS -wd181"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
71 # zero used for undefined preprocessing identifier
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
72 CFLAGS="$CFLAGS -wd193"
68
056fd0e5a5a6 nginx 0.1.34
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
73 #the format string ends before this argument
056fd0e5a5a6 nginx 0.1.34
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
74 CFLAGS="$CFLAGS -wd268"
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
75 # invalid format string conversion
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
76 CFLAGS="$CFLAGS -wd269"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
77 # conversion from "long long" to "size_t" may lose significant bits
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
78 CFLAGS="$CFLAGS -wd810"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
79 # parameter was never referenced
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
80 CFLAGS="$CFLAGS -wd869"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
81
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
82 # STUB
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
83 # enumerated type mixed with another type
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
84 CFLAGS="$CFLAGS -wd188"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
85 # controlling expression is constant
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
86 CFLAGS="$CFLAGS -wd279"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
87 # operands are evaluated in unspecified order
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
88 CFLAGS="$CFLAGS -wd981"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
89 # external definition with no prior declaration
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
90 CFLAGS="$CFLAGS -wd1418"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
91 # external declaration in primary source file
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
92 CFLAGS="$CFLAGS -wd1419"
104
146eff53ab60 nginx 0.2.6
Igor Sysoev <http://sysoev.ru>
parents: 72
diff changeset
93 # explicit conversion of a 64-bit integral type to a smaller integral type
146eff53ab60 nginx 0.2.6
Igor Sysoev <http://sysoev.ru>
parents: 72
diff changeset
94 CFLAGS="$CFLAGS -wd1683"
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
95
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
96 case "$NGX_ICC_VER" in
104
146eff53ab60 nginx 0.2.6
Igor Sysoev <http://sysoev.ru>
parents: 72
diff changeset
97 8.* | 9.*)
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
98 # "cc" clobber ignored, warnings for Liunx's htons()
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
99 CFLAGS="$CFLAGS -wd1469"
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
100
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
101 # STUB
72
b31656313b59 nginx 0.1.36
Igor Sysoev <http://sysoev.ru>
parents: 70
diff changeset
102 # non-POD class type passed through ellipsis, Linux only ?
70
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
103 CFLAGS="$CFLAGS -wd1595"
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
104 ;;
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
105
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
106 *)
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
107 ;;
8ad297c88dcb nginx 0.1.35
Igor Sysoev <http://sysoev.ru>
parents: 68
diff changeset
108 esac
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
109
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
110 # stop on warning
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
111 CFLAGS="$CFLAGS -Werror"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
112
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
113 # debug
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
114 CFLAGS="$CFLAGS -g"