Mercurial > hg > nginx-vendor-current

comparison auto/make @ 10:46833bd150cb NGINX_0_1_5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.5 *) Bugfix: on Solaris and Linux there may be too many "recvmsg() returned not enough data" alerts. *) Bugfix: there were the "writev() failed (22: Invalid argument)" errors on Solaris in proxy mode without sendfile. On other platforms that do not support sendfile at all the process got caught in an endless loop. *) Bugfix: segmentation fault on Solaris in proxy mode and using sendfile. *) Bugfix: segmentation fault on Solaris. *) Bugfix: on-line upgrade did not work on Linux. *) Bugfix: the ngx_http_autoindex_module module did not escape the spaces, the quotes, and the percent signs in the directory listing. *) Change: the decrease of the copy operations. *) Feature: the userid_p3p directive.
author Igor Sysoev <http://sysoev.ru>
date Thu, 11 Nov 2004 00:00:00 +0300
parents 4b2dafa26fe2
children 74b1868dd3cd
comparison
equal deleted inserted replaced
9:77eee314ddbd 10:46833bd150cb
130 -e "s/\([^ ]*\.\)c/$NGX_OBJS\/\1$ngx_objext/g" \ 130 -e "s/\([^ ]*\.\)c/$NGX_OBJS\/\1$ngx_objext/g" \
131 -e "s/\([^ ]*\.\)S/$NGX_OBJS\/\1$ngx_objext/g"` 131 -e "s/\([^ ]*\.\)S/$NGX_OBJS\/\1$ngx_objext/g"`
132 132
133 ngx_modules_obj=`echo $ngx_modules_c | sed -e "s/\(.*\.\)c/\1$ngx_objext/"` 133 ngx_modules_obj=`echo $ngx_modules_c | sed -e "s/\(.*\.\)c/\1$ngx_objext/"`
134 134
135 ngx_deps=`echo $ngx_all_objs $ngx_modules_obj $LINK_DEPS \ 135
136 if test -n "$NGX_RES"; then
137 ngx_res=$NGX_RES
138 else
139 ngx_res="$NGX_RC $NGX_ICONS"
140 ngx_rcc=`echo $NGX_RCC | sed -e "s/\//$ngx_regex_dirsep/g"`
141 fi
142
143 ngx_deps=`echo $ngx_all_objs $ngx_modules_obj $ngx_res $LINK_DEPS \
136 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ 144 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
137 -e "s/\//$ngx_regex_dirsep/g"` 145 -e "s/\//$ngx_regex_dirsep/g"`
138 146
139 ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \ 147 ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \
140 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ 148 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
144 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_regex_cont/"`} 152 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_regex_cont/"`}
145 153
146 ngx_link=${CORE_LINK:+`echo $CORE_LINK \ 154 ngx_link=${CORE_LINK:+`echo $CORE_LINK \
147 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_regex_cont/"`} 155 | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_regex_cont/"`}
148 156
157
149 cat << END >> $NGX_MAKEFILE 158 cat << END >> $NGX_MAKEFILE
150 159
151 $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}: $ngx_deps$ngx_spacer 160 $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}: $ngx_deps$ngx_spacer
152 \$(LINK) ${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_cont$ngx_objs$ngx_libs$ngx_link 161 \$(LINK) ${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_cont$ngx_objs$ngx_libs$ngx_link
162 $ngx_rcc
153 163
154 END 164 END
155 165
156 166
157 # ngx_modules.c 167 # ngx_modules.c
254 done 264 done
255 265
256 fi 266 fi
257 267
258 268
269 # Win32 resource file
270
271 if test -n "$NGX_RES"; then
272
273 ngx_res=`echo "$NGX_RES: $NGX_RC $NGX_ICONS" \
274 | sed -e "s/\//$ngx_regex_dirsep/g"`
275 ngx_rcc=`echo $NGX_RCC | sed -e "s/\//$ngx_regex_dirsep/g"`
276
277 cat << END >> $NGX_MAKEFILE
278
279 $ngx_res
280 $ngx_rcc
281
282 END
283
284 fi
285
286
259 # the precompiled headers 287 # the precompiled headers
260 288
261 if test -n "$NGX_PCH"; then 289 if test -n "$NGX_PCH"; then
262 echo "#include <ngx_config.h>" > $OBJS/ngx_pch.c 290 echo "#include <ngx_config.h>" > $OBJS/ngx_pch.c
263 291