comparison auto/modules @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 9773720b845e c5122335e41d
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
100 # ngx_http_header_filter 100 # ngx_http_header_filter
101 # ngx_http_chunked_filter 101 # ngx_http_chunked_filter
102 # ngx_http_range_header_filter 102 # ngx_http_range_header_filter
103 # ngx_http_gzip_filter 103 # ngx_http_gzip_filter
104 # ngx_http_postpone_filter 104 # ngx_http_postpone_filter
105 # ngx_http_ssi_filter
105 # ngx_http_charset_filter 106 # ngx_http_charset_filter
106 # ngx_http_ssi_filter
107 # ngx_http_xslt_filter 107 # ngx_http_xslt_filter
108 # ngx_http_image_filter_filter 108 # ngx_http_image_filter
109 # ngx_http_sub_filter 109 # ngx_http_sub_filter
110 # ngx_http_addition_filter 110 # ngx_http_addition_filter
111 # ngx_http_userid_filter 111 # ngx_http_userid_filter
112 # ngx_http_headers_filter 112 # ngx_http_headers_filter
113 # ngx_http_copy_filter 113 # ngx_http_copy_filter
129 if [ $HTTP_POSTPONE = YES ]; then 129 if [ $HTTP_POSTPONE = YES ]; then
130 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE" 130 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
131 HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS" 131 HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
132 fi 132 fi
133 133
134 if [ $HTTP_CHARSET = YES ]; then
135 have=NGX_HTTP_CHARSET . auto/have
136 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
137 HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
138 fi
139
140 if [ $HTTP_SSI = YES ]; then 134 if [ $HTTP_SSI = YES ]; then
141 have=NGX_HTTP_SSI . auto/have 135 have=NGX_HTTP_SSI . auto/have
142 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE" 136 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSI_FILTER_MODULE"
143 HTTP_DEPS="$HTTP_DEPS $HTTP_SSI_DEPS" 137 HTTP_DEPS="$HTTP_DEPS $HTTP_SSI_DEPS"
144 HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS" 138 HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS"
145 fi 139 fi
146 140
141 if [ $HTTP_CHARSET = YES ]; then
142 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE"
143 HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS"
144 fi
145
147 if [ $HTTP_XSLT = YES ]; then 146 if [ $HTTP_XSLT = YES ]; then
148 USE_LIBXSLT=YES 147 USE_LIBXSLT=YES
149 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE" 148 HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_XSLT_FILTER_MODULE"
150 HTTP_SRCS="$HTTP_SRCS $HTTP_XSLT_SRCS" 149 HTTP_SRCS="$HTTP_SRCS $HTTP_XSLT_SRCS"
151 fi 150 fi
184 HTTP_MODULES="$HTTP_MODULES $HTTP_DAV_MODULE" 183 HTTP_MODULES="$HTTP_MODULES $HTTP_DAV_MODULE"
185 HTTP_SRCS="$HTTP_SRCS $HTTP_DAV_SRCS" 184 HTTP_SRCS="$HTTP_SRCS $HTTP_DAV_SRCS"
186 fi 185 fi
187 186
188 if [ $HTTP_AUTOINDEX = YES ]; then 187 if [ $HTTP_AUTOINDEX = YES ]; then
189 have=NGX_HTTP_AUTOINDEX . auto/have
190 HTTP_MODULES="$HTTP_MODULES $HTTP_AUTOINDEX_MODULE" 188 HTTP_MODULES="$HTTP_MODULES $HTTP_AUTOINDEX_MODULE"
191 HTTP_SRCS="$HTTP_SRCS $HTTP_AUTOINDEX_SRCS" 189 HTTP_SRCS="$HTTP_SRCS $HTTP_AUTOINDEX_SRCS"
192 fi 190 fi
193 191
194 HTTP_MODULES="$HTTP_MODULES $HTTP_INDEX_MODULE" 192 HTTP_MODULES="$HTTP_MODULES $HTTP_INDEX_MODULE"
195 193
196 if [ $HTTP_RANDOM_INDEX = YES ]; then 194 if [ $HTTP_RANDOM_INDEX = YES ]; then
197 have=NGX_HTTP_RANDOM_INDEX . auto/have
198 HTTP_MODULES="$HTTP_MODULES $HTTP_RANDOM_INDEX_MODULE" 195 HTTP_MODULES="$HTTP_MODULES $HTTP_RANDOM_INDEX_MODULE"
199 HTTP_SRCS="$HTTP_SRCS $HTTP_RANDOM_INDEX_SRCS" 196 HTTP_SRCS="$HTTP_SRCS $HTTP_RANDOM_INDEX_SRCS"
200 fi 197 fi
201 198
202 if [ $HTTP_AUTH_BASIC = YES ]; then 199 if [ $HTTP_AUTH_BASIC = YES ]; then
203 have=NGX_HTTP_AUTH_BASIC . auto/have
204 have=NGX_CRYPT . auto/have 200 have=NGX_CRYPT . auto/have
205 HTTP_MODULES="$HTTP_MODULES $HTTP_AUTH_BASIC_MODULE" 201 HTTP_MODULES="$HTTP_MODULES $HTTP_AUTH_BASIC_MODULE"
206 HTTP_SRCS="$HTTP_SRCS $HTTP_AUTH_BASIC_SRCS" 202 HTTP_SRCS="$HTTP_SRCS $HTTP_AUTH_BASIC_SRCS"
207 CORE_LIBS="$CORE_LIBS $CRYPT_LIB" 203 CORE_LIBS="$CORE_LIBS $CRYPT_LIB"
208 fi 204 fi
209 205
210 if [ $HTTP_ACCESS = YES ]; then 206 if [ $HTTP_ACCESS = YES ]; then
211 have=NGX_HTTP_ACCESS . auto/have
212 HTTP_MODULES="$HTTP_MODULES $HTTP_ACCESS_MODULE" 207 HTTP_MODULES="$HTTP_MODULES $HTTP_ACCESS_MODULE"
213 HTTP_SRCS="$HTTP_SRCS $HTTP_ACCESS_SRCS" 208 HTTP_SRCS="$HTTP_SRCS $HTTP_ACCESS_SRCS"
214 fi 209 fi
215 210
216 if [ $HTTP_LIMIT_ZONE = YES ]; then 211 if [ $HTTP_LIMIT_ZONE = YES ]; then
228 HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE" 223 HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE"
229 HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS" 224 HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS"
230 fi 225 fi
231 226
232 if [ $HTTP_STATUS = YES ]; then 227 if [ $HTTP_STATUS = YES ]; then
233 have=NGX_HTTP_STATUS . auto/have
234 HTTP_MODULES="$HTTP_MODULES $HTTP_STATUS_MODULE" 228 HTTP_MODULES="$HTTP_MODULES $HTTP_STATUS_MODULE"
235 HTTP_SRCS="$HTTP_SRCS $HTTP_STATUS_SRCS" 229 HTTP_SRCS="$HTTP_SRCS $HTTP_STATUS_SRCS"
236 fi 230 fi
237 231
238 if [ $HTTP_GEO = YES ]; then 232 if [ $HTTP_GEO = YES ]; then
240 HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE" 234 HTTP_MODULES="$HTTP_MODULES $HTTP_GEO_MODULE"
241 HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS" 235 HTTP_SRCS="$HTTP_SRCS $HTTP_GEO_SRCS"
242 fi 236 fi
243 237
244 if [ $HTTP_GEOIP = YES ]; then 238 if [ $HTTP_GEOIP = YES ]; then
245 have=NGX_HTTP_GEOIP . auto/have
246 HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE" 239 HTTP_MODULES="$HTTP_MODULES $HTTP_GEOIP_MODULE"
247 HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS" 240 HTTP_SRCS="$HTTP_SRCS $HTTP_GEOIP_SRCS"
248 fi 241 fi
249 242
250 if [ $HTTP_MAP = YES ]; then 243 if [ $HTTP_MAP = YES ]; then
251 have=NGX_HTTP_MAP . auto/have
252 HTTP_MODULES="$HTTP_MODULES $HTTP_MAP_MODULE" 244 HTTP_MODULES="$HTTP_MODULES $HTTP_MAP_MODULE"
253 HTTP_SRCS="$HTTP_SRCS $HTTP_MAP_SRCS" 245 HTTP_SRCS="$HTTP_SRCS $HTTP_MAP_SRCS"
246 fi
247
248 if [ $HTTP_SPLIT_CLIENTS = YES ]; then
249 HTTP_MODULES="$HTTP_MODULES $HTTP_SPLIT_CLIENTS_MODULE"
250 HTTP_SRCS="$HTTP_SRCS $HTTP_SPLIT_CLIENTS_SRCS"
254 fi 251 fi
255 252
256 if [ $HTTP_REFERER = YES ]; then 253 if [ $HTTP_REFERER = YES ]; then
257 HTTP_MODULES="$HTTP_MODULES $HTTP_REFERER_MODULE" 254 HTTP_MODULES="$HTTP_MODULES $HTTP_REFERER_MODULE"
258 HTTP_SRCS="$HTTP_SRCS $HTTP_REFERER_SRCS" 255 HTTP_SRCS="$HTTP_SRCS $HTTP_REFERER_SRCS"
259 fi 256 fi
260 257
261 if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then 258 if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then
262 have=NGX_HTTP_REWRITE . auto/have
263 USE_PCRE=YES 259 USE_PCRE=YES
264 HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE" 260 HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE"
265 HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS" 261 HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS"
266 fi 262 fi
267 263
284 if [ $HTTP_FASTCGI = YES ]; then 280 if [ $HTTP_FASTCGI = YES ]; then
285 HTTP_MODULES="$HTTP_MODULES $HTTP_FASTCGI_MODULE" 281 HTTP_MODULES="$HTTP_MODULES $HTTP_FASTCGI_MODULE"
286 HTTP_SRCS="$HTTP_SRCS $HTTP_FASTCGI_SRCS" 282 HTTP_SRCS="$HTTP_SRCS $HTTP_FASTCGI_SRCS"
287 fi 283 fi
288 284
285 if [ $HTTP_UWSGI = YES ]; then
286 HTTP_MODULES="$HTTP_MODULES $HTTP_UWSGI_MODULE"
287 HTTP_SRCS="$HTTP_SRCS $HTTP_UWSGI_SRCS"
288 fi
289
290 if [ $HTTP_SCGI = YES ]; then
291 HTTP_MODULES="$HTTP_MODULES $HTTP_SCGI_MODULE"
292 HTTP_SRCS="$HTTP_SRCS $HTTP_SCGI_SRCS"
293 fi
294
289 if [ $HTTP_PERL = YES ]; then 295 if [ $HTTP_PERL = YES ]; then
290 USE_PERL=YES 296 USE_PERL=YES
291 have=NGX_HTTP_PERL . auto/have
292 HTTP_MODULES="$HTTP_MODULES $HTTP_PERL_MODULE" 297 HTTP_MODULES="$HTTP_MODULES $HTTP_PERL_MODULE"
293 HTTP_INCS="$HTTP_INCS $HTTP_PERL_INCS" 298 HTTP_INCS="$HTTP_INCS $HTTP_PERL_INCS"
294 HTTP_DEPS="$HTTP_DEPS $HTTP_PERL_DEPS" 299 HTTP_DEPS="$HTTP_DEPS $HTTP_PERL_DEPS"
295 HTTP_SRCS="$HTTP_SRCS $HTTP_PERL_SRCS" 300 HTTP_SRCS="$HTTP_SRCS $HTTP_PERL_SRCS"
296 fi 301 fi
312 317
313 if [ $HTTP_SECURE_LINK = YES ]; then 318 if [ $HTTP_SECURE_LINK = YES ]; then
314 USE_MD5=YES 319 USE_MD5=YES
315 HTTP_MODULES="$HTTP_MODULES $HTTP_SECURE_LINK_MODULE" 320 HTTP_MODULES="$HTTP_MODULES $HTTP_SECURE_LINK_MODULE"
316 HTTP_SRCS="$HTTP_SRCS $HTTP_SECURE_LINK_SRCS" 321 HTTP_SRCS="$HTTP_SRCS $HTTP_SECURE_LINK_SRCS"
322 fi
323
324 if [ $HTTP_DEGRADATION = YES ]; then
325 have=NGX_HTTP_DEGRADATION . auto/have
326 HTTP_MODULES="$HTTP_MODULES $HTTP_DEGRADATION_MODULE"
327 HTTP_SRCS="$HTTP_SRCS $HTTP_DEGRADATION_SRCS"
317 fi 328 fi
318 329
319 if [ $HTTP_FLV = YES ]; then 330 if [ $HTTP_FLV = YES ]; then
320 HTTP_MODULES="$HTTP_MODULES $HTTP_FLV_MODULE" 331 HTTP_MODULES="$HTTP_MODULES $HTTP_FLV_MODULE"
321 HTTP_SRCS="$HTTP_SRCS $HTTP_FLV_SRCS" 332 HTTP_SRCS="$HTTP_SRCS $HTTP_FLV_SRCS"