Mercurial > hg > nginx-ranges

comparison auto/options @ 635:e67b227c8dbb default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 4d3e880ce86c
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
50 50
51 NGX_HTTP_LOG_PATH= 51 NGX_HTTP_LOG_PATH=
52 NGX_HTTP_CLIENT_TEMP_PATH= 52 NGX_HTTP_CLIENT_TEMP_PATH=
53 NGX_HTTP_PROXY_TEMP_PATH= 53 NGX_HTTP_PROXY_TEMP_PATH=
54 NGX_HTTP_FASTCGI_TEMP_PATH= 54 NGX_HTTP_FASTCGI_TEMP_PATH=
55 NGX_HTTP_UWSGI_TEMP_PATH=
56 NGX_HTTP_SCGI_TEMP_PATH=
55 57
56 HTTP_CACHE=YES 58 HTTP_CACHE=YES
57 HTTP_CHARSET=YES 59 HTTP_CHARSET=YES
58 HTTP_GZIP=YES 60 HTTP_GZIP=YES
59 HTTP_SSL=NO 61 HTTP_SSL=NO
72 HTTP_RANDOM_INDEX=NO 74 HTTP_RANDOM_INDEX=NO
73 HTTP_STATUS=NO 75 HTTP_STATUS=NO
74 HTTP_GEO=YES 76 HTTP_GEO=YES
75 HTTP_GEOIP=NO 77 HTTP_GEOIP=NO
76 HTTP_MAP=YES 78 HTTP_MAP=YES
79 HTTP_SPLIT_CLIENTS=YES
77 HTTP_REFERER=YES 80 HTTP_REFERER=YES
78 HTTP_REWRITE=YES 81 HTTP_REWRITE=YES
79 HTTP_PROXY=YES 82 HTTP_PROXY=YES
80 HTTP_FASTCGI=YES 83 HTTP_FASTCGI=YES
84 HTTP_UWSGI=YES
85 HTTP_SCGI=YES
81 HTTP_PERL=NO 86 HTTP_PERL=NO
82 HTTP_MEMCACHED=YES 87 HTTP_MEMCACHED=YES
83 HTTP_LIMIT_ZONE=YES 88 HTTP_LIMIT_ZONE=YES
84 HTTP_LIMIT_REQ=YES 89 HTTP_LIMIT_REQ=YES
85 HTTP_EMPTY_GIF=YES 90 HTTP_EMPTY_GIF=YES
182 187
183 --http-log-path=*) NGX_HTTP_LOG_PATH="$value" ;; 188 --http-log-path=*) NGX_HTTP_LOG_PATH="$value" ;;
184 --http-client-body-temp-path=*) NGX_HTTP_CLIENT_TEMP_PATH="$value" ;; 189 --http-client-body-temp-path=*) NGX_HTTP_CLIENT_TEMP_PATH="$value" ;;
185 --http-proxy-temp-path=*) NGX_HTTP_PROXY_TEMP_PATH="$value" ;; 190 --http-proxy-temp-path=*) NGX_HTTP_PROXY_TEMP_PATH="$value" ;;
186 --http-fastcgi-temp-path=*) NGX_HTTP_FASTCGI_TEMP_PATH="$value" ;; 191 --http-fastcgi-temp-path=*) NGX_HTTP_FASTCGI_TEMP_PATH="$value" ;;
192 --http-uwsgi-temp-path=*) NGX_HTTP_UWSGI_TEMP_PATH="$value" ;;
193 --http-scgi-temp-path=*) NGX_HTTP_SCGI_TEMP_PATH="$value" ;;
187 194
188 --with-http_ssl_module) HTTP_SSL=YES ;; 195 --with-http_ssl_module) HTTP_SSL=YES ;;
189 --with-http_realip_module) HTTP_REALIP=YES ;; 196 --with-http_realip_module) HTTP_REALIP=YES ;;
190 --with-http_addition_module) HTTP_ADDITION=YES ;; 197 --with-http_addition_module) HTTP_ADDITION=YES ;;
191 --with-http_xslt_module) HTTP_XSLT=YES ;; 198 --with-http_xslt_module) HTTP_XSLT=YES ;;
207 --without-http_auth_basic_module) HTTP_AUTH_BASIC=NO ;; 214 --without-http_auth_basic_module) HTTP_AUTH_BASIC=NO ;;
208 --without-http_autoindex_module) HTTP_AUTOINDEX=NO ;; 215 --without-http_autoindex_module) HTTP_AUTOINDEX=NO ;;
209 --without-http_status_module) HTTP_STATUS=NO ;; 216 --without-http_status_module) HTTP_STATUS=NO ;;
210 --without-http_geo_module) HTTP_GEO=NO ;; 217 --without-http_geo_module) HTTP_GEO=NO ;;
211 --without-http_map_module) HTTP_MAP=NO ;; 218 --without-http_map_module) HTTP_MAP=NO ;;
219 --without-http_split_clients_module) HTTP_SPLIT_CLIENTS=NO ;;
212 --without-http_referer_module) HTTP_REFERER=NO ;; 220 --without-http_referer_module) HTTP_REFERER=NO ;;
213 --without-http_rewrite_module) HTTP_REWRITE=NO ;; 221 --without-http_rewrite_module) HTTP_REWRITE=NO ;;
214 --without-http_proxy_module) HTTP_PROXY=NO ;; 222 --without-http_proxy_module) HTTP_PROXY=NO ;;
215 --without-http_fastcgi_module) HTTP_FASTCGI=NO ;; 223 --without-http_fastcgi_module) HTTP_FASTCGI=NO ;;
224 --without-http_uwsgi_module) HTTP_UWSGI=NO ;;
225 --without-http_scgi_module) HTTP_SCGI=NO ;;
216 --without-http_memcached_module) HTTP_MEMCACHED=NO ;; 226 --without-http_memcached_module) HTTP_MEMCACHED=NO ;;
217 --without-http_limit_zone_module) HTTP_LIMIT_ZONE=NO ;; 227 --without-http_limit_zone_module) HTTP_LIMIT_ZONE=NO ;;
218 --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;; 228 --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;;
219 --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;; 229 --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;;
220 --without-http_browser_module) HTTP_BROWSER=NO ;; 230 --without-http_browser_module) HTTP_BROWSER=NO ;;
339 --without-http_access_module disable ngx_http_access_module 349 --without-http_access_module disable ngx_http_access_module
340 --without-http_auth_basic_module disable ngx_http_auth_basic_module 350 --without-http_auth_basic_module disable ngx_http_auth_basic_module
341 --without-http_autoindex_module disable ngx_http_autoindex_module 351 --without-http_autoindex_module disable ngx_http_autoindex_module
342 --without-http_geo_module disable ngx_http_geo_module 352 --without-http_geo_module disable ngx_http_geo_module
343 --without-http_map_module disable ngx_http_map_module 353 --without-http_map_module disable ngx_http_map_module
354 --without-http_split_clients_module disable ngx_http_split_clients_module
344 --without-http_referer_module disable ngx_http_referer_module 355 --without-http_referer_module disable ngx_http_referer_module
345 --without-http_rewrite_module disable ngx_http_rewrite_module 356 --without-http_rewrite_module disable ngx_http_rewrite_module
346 --without-http_proxy_module disable ngx_http_proxy_module 357 --without-http_proxy_module disable ngx_http_proxy_module
347 --without-http_fastcgi_module disable ngx_http_fastcgi_module 358 --without-http_fastcgi_module disable ngx_http_fastcgi_module
359 --without-http_uwsgi_module disable ngx_http_uwsgi_module
360 --without-http_scgi_module disable ngx_http_scgi_module
348 --without-http_memcached_module disable ngx_http_memcached_module 361 --without-http_memcached_module disable ngx_http_memcached_module
349 --without-http_limit_zone_module disable ngx_http_limit_zone_module 362 --without-http_limit_zone_module disable ngx_http_limit_zone_module
350 --without-http_limit_req_module disable ngx_http_limit_req_module 363 --without-http_limit_req_module disable ngx_http_limit_req_module
351 --without-http_empty_gif_module disable ngx_http_empty_gif_module 364 --without-http_empty_gif_module disable ngx_http_empty_gif_module
352 --without-http_browser_module disable ngx_http_browser_module 365 --without-http_browser_module disable ngx_http_browser_module
361 --http-client-body-temp-path=PATH set path to the http client request body 374 --http-client-body-temp-path=PATH set path to the http client request body
362 temporary files 375 temporary files
363 --http-proxy-temp-path=PATH set path to the http proxy temporary files 376 --http-proxy-temp-path=PATH set path to the http proxy temporary files
364 --http-fastcgi-temp-path=PATH set path to the http fastcgi temporary 377 --http-fastcgi-temp-path=PATH set path to the http fastcgi temporary
365 files 378 files
379 --http-uwsgi-temp-path=PATH set path to the http uwsgi temporary files
380 --http-scgi-temp-path=PATH set path to the http scgi temporary files
366 381
367 --without-http disable HTTP server 382 --without-http disable HTTP server
368 --without-http-cache disable HTTP cache 383 --without-http-cache disable HTTP cache
369 384
370 --with-mail enable POP3/IMAP4/SMTP proxy module 385 --with-mail enable POP3/IMAP4/SMTP proxy module
450 465
451 NGX_HTTP_LOG_PATH=${NGX_HTTP_LOG_PATH:-logs/access.log} 466 NGX_HTTP_LOG_PATH=${NGX_HTTP_LOG_PATH:-logs/access.log}
452 NGX_HTTP_CLIENT_TEMP_PATH=${NGX_HTTP_CLIENT_TEMP_PATH:-client_body_temp} 467 NGX_HTTP_CLIENT_TEMP_PATH=${NGX_HTTP_CLIENT_TEMP_PATH:-client_body_temp}
453 NGX_HTTP_PROXY_TEMP_PATH=${NGX_HTTP_PROXY_TEMP_PATH:-proxy_temp} 468 NGX_HTTP_PROXY_TEMP_PATH=${NGX_HTTP_PROXY_TEMP_PATH:-proxy_temp}
454 NGX_HTTP_FASTCGI_TEMP_PATH=${NGX_HTTP_FASTCGI_TEMP_PATH:-fastcgi_temp} 469 NGX_HTTP_FASTCGI_TEMP_PATH=${NGX_HTTP_FASTCGI_TEMP_PATH:-fastcgi_temp}
470 NGX_HTTP_UWSGI_TEMP_PATH=${NGX_HTTP_UWSGI_TEMP_PATH:-uwsgi_temp}
471 NGX_HTTP_SCGI_TEMP_PATH=${NGX_HTTP_SCGI_TEMP_PATH:-scgi_temp}
455 472
456 case ".$NGX_PERL_MODULES" in 473 case ".$NGX_PERL_MODULES" in
457 ./*) 474 ./*)
458 ;; 475 ;;
459 476