annotate auto/cc/msvc @ 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 b55cbf18157e
children d25a1d6034f1
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
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
5 # MSVC 6.0 SP2, MSVC Toolkit 2003 (7.1)
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7 # optimizations
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
9 # maximize speed, equivalent to -Og -Oi -Ot -Oy -Ob2 -Gs -GF -Gy
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 CFLAGS="$CFLAGS -O2"
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
11
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 # enable global optimization
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
13 #CFLAGS="$CFLAGS -Og"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 # enable intrinsic functions
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
15 #CFLAGS="$CFLAGS -Oi"
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
16
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
17 # disable inline expansion
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
18 #CFLAGS="$CFLAGS -Ob0"
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
19 # explicit inline expansion
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
20 #CFLAGS="$CFLAGS -Ob1"
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
21 # explicit and implicit inline expansion
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
22 #CFLAGS="$CFLAGS -Ob2"
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
23
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 # enable frame pointer omission
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
25 #CFLAGS="$CFLAGS -Oy"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 # disable stack checking calls
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
27 #CFLAGS="$CFLAGS -Gs"
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
28
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
29 # pools strings as read/write
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
30 #CFLAGS="$CFLAGS -Gf"
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
31 # pools strings as read-only
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
32 #CFLAGS="$CFLAGS -GF"
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 52
diff changeset
33
4
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 case $CPU in
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 pentium)
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 # optimize for Pentium and Athlon
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 CPU_OPT="-G5"
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
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41 pentiumpro)
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 # optimize for Pentium Pro, Pentium II and Pentium III
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 CPU_OPT="-G6"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44 ;;
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 pentium4)
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
47 # optimize for Pentium 4, MSVC 7
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
48 CPU_OPT="-G7"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49 ;;
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 esac
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51
52
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
52 # __stdcall
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
53 #CPU_OPT="$CPU_OPT -Gz"
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
54 # __fastcall
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
55 CPU_OPT="$CPU_OPT -Gr"
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
56
0d75d65c642f nginx 0.1.26
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
57
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58 CFLAGS="$CFLAGS $CPU_OPT"
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
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63 #CFLAGS="$CFLAGS -W3"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64 CFLAGS="$CFLAGS -W4"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 # stop on warning
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67 CFLAGS="$CFLAGS -WX"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
69 # disable logo
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
70 CFLAGS="$CFLAGS -nologo"
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
71
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
72
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
73 LINK="\$(CC)"
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
74
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
75 # the link flags
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
76 CORE_LINK="$CORE_LINK -link -verbose:lib"
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
77
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
78 if [ $NGX_CC_NAME = msvc7 ]; then
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
79 # link with libcmt.lib, multithreaded
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
80 LIBC="-MT"
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
81 else
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
82 # link with msvcrt.dll
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
83 LIBC="-MD"
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
84 fi
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
85
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86 CFLAGS="$CFLAGS $LIBC"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
87
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
88 # Win32 GUI mode application
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
89 CORE_LIBS="$CORE_LIBS kernel32.lib user32.lib"
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
90 CORE_LINK="$CORE_LINK -subsystem:windows -entry:mainCRTStartup"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
91
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
92 # debug
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
93 CFLAGS="$CFLAGS -Yd"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
94 CORE_LINK="$CORE_LINK -debug -debugtype:coff"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
95
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
96
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
97 # precompiled headers
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
98 if [ $NGX_CC_NAME != msvc7 ]; then
18
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
99 CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch"
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
100 NGX_PCH="$NGX_OBJS/ngx_config.pch"
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
101 NGX_BUILD_PCH="-Ycngx_config.h -Fp$NGX_OBJS/ngx_config.pch"
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
102 NGX_USE_PCH="-Yungx_config.h -Fp$NGX_OBJS/ngx_config.pch"
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
103 fi
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
104
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
105
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
106 # the resource file
18
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
107 NGX_RES="$NGX_OBJS/nginx.res"
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
108 NGX_RCC="rc -fo$NGX_RES \$(CORE_INCS) $NGX_WIN32_RC"
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
109 CORE_LINK="$NGX_RES $CORE_LINK"
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
110
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
111
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
112 ngx_objout="-Fo"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
113 ngx_binout="-Fe"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
114 ngx_objext="obj"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
115 ngx_binext=".exe"
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
116
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
117 #ngx_regex_dirsep='\\'
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
118 #ngx_dirsep="\\"