comparison auto/options @ 482:392c16f2d858 NGINX_0_7_53

nginx 0.7.53 *) Change: now a log set by --error-log-path is created from the very start-up. *) Feature: now the start up errors and warnings are outputted to an error_log and stderr. *) Feature: the empty --prefix= configure parameter forces nginx to use a directory where it was run as prefix. *) Feature: the -p switch. *) Feature: the -s switch on Unix platforms. *) Feature: the -? and -h switches. Thanks to Jerome Loyet. *) Feature: now switches may be set in condensed form. *) Bugfix: nginx/Windows did not work if configuration file was given by the -c switch. *) Bugfix: temporary files might be not removed if the "proxy_store", "fastcgi_store", "proxy_cache", or "fastcgi_cache" were used. Thanks to Maxim Dounin. *) Bugfix: an incorrect value was passed to mail proxy authentication server in "Auth-Method" header line; the bug had appeared in 0.7.34. Thanks to Simon Lecaille. *) Bugfix: system error text descriptions were not logged on Linux; the bug had appeared in 0.7.45. *) Bugfix: the "fastcgi_cache_min_uses" directive did not work. Thanks to Andrew Vorobyoff.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Apr 2009 00:00:00 +0400
parents c8cfb6c462ef
children ed5e10fb40fc
comparison
equal deleted inserted replaced
481:0c98173187ac 482:392c16f2d858
127 NGX_GOOGLE_PERFTOOLS=NO 127 NGX_GOOGLE_PERFTOOLS=NO
128 NGX_CPP_TEST=NO 128 NGX_CPP_TEST=NO
129 129
130 NGX_CPU_CACHE_LINE= 130 NGX_CPU_CACHE_LINE=
131 131
132 opt=
132 133
133 for option 134 for option
134 do 135 do
136 opt="$opt `echo $option | sed -e \"s/\(--[^=]*=\)\(.* .*\)/\1'\2'/\"`"
137
135 case "$option" in 138 case "$option" in
136 -*=*) value=`echo "$option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; 139 -*=*) value=`echo "$option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;;
137 *) value="" ;; 140 *) value="" ;;
138 esac 141 esac
139 142
140 case "$option" in 143 case "$option" in
141 --help) help=yes ;; 144 --help) help=yes ;;
142 145
146 --prefix=) NGX_PREFIX="!" ;;
143 --prefix=*) NGX_PREFIX="$value" ;; 147 --prefix=*) NGX_PREFIX="$value" ;;
144 --sbin-path=*) NGX_SBIN_PATH="$value" ;; 148 --sbin-path=*) NGX_SBIN_PATH="$value" ;;
145 --conf-path=*) NGX_CONF_PATH="$value" ;; 149 --conf-path=*) NGX_CONF_PATH="$value" ;;
146 --error-log-path=*) NGX_ERROR_LOG_PATH="$value";; 150 --error-log-path=*) NGX_ERROR_LOG_PATH="$value";;
147 --pid-path=*) NGX_PID_PATH="$value" ;; 151 --pid-path=*) NGX_PID_PATH="$value" ;;
265 ;; 269 ;;
266 esac 270 esac
267 done 271 done
268 272
269 273
274 NGX_CONFIGURE="$opt"
275
276
270 if [ $help = yes ]; then 277 if [ $help = yes ]; then
271 278
272 cat << END 279 cat << END
273 280
274 --help this message 281 --help this message
407 if [ ".$NGX_PLATFORM" = ".win32" ]; then 414 if [ ".$NGX_PLATFORM" = ".win32" ]; then
408 NGX_WINE=$WINE 415 NGX_WINE=$WINE
409 fi 416 fi
410 417
411 418
412 NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx} 419 NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf}
413
414
415 case ".$NGX_SBIN_PATH" in
416 ./*)
417 ;;
418
419 .)
420 NGX_SBIN_PATH=$NGX_PREFIX/sbin/nginx
421 ;;
422
423 *)
424 NGX_SBIN_PATH=$NGX_PREFIX/$NGX_SBIN_PATH
425 ;;
426 esac
427
428
429 case ".$NGX_CONF_PATH" in
430 ./*)
431 ;;
432
433 .)
434 NGX_CONF_PATH=$NGX_PREFIX/conf/nginx.conf
435 ;;
436
437 *)
438 NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH
439 ;;
440 esac
441
442
443 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH` 420 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
444 421 NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid}
445 422 NGX_LOCK_PATH=${NGX_LOCK_PATH:-logs/nginx.lock}
446 case ".$NGX_PID_PATH" in 423
447 ./*) 424 if [ ".$NGX_ERROR_LOG_PATH" = ".stderr" ]; then
448 ;; 425 NGX_ERROR_LOG_PATH=
449 426 else
450 .) 427 NGX_ERROR_LOG_PATH=${NGX_ERROR_LOG_PATH:-logs/error.log}
451 NGX_PID_PATH=$NGX_PREFIX/logs/nginx.pid 428 fi
452 ;; 429
453 430 NGX_HTTP_LOG_PATH=${NGX_HTTP_LOG_PATH:-logs/access.log}
454 *) 431 NGX_HTTP_CLIENT_TEMP_PATH=${NGX_HTTP_CLIENT_TEMP_PATH:-client_body_temp}
455 NGX_PID_PATH=$NGX_PREFIX/$NGX_PID_PATH 432 NGX_HTTP_PROXY_TEMP_PATH=${NGX_HTTP_PROXY_TEMP_PATH:-proxy_temp}
456 ;; 433 NGX_HTTP_FASTCGI_TEMP_PATH=${NGX_HTTP_FASTCGI_TEMP_PATH:-fastcgi_temp}
457 esac
458
459
460 case ".$NGX_LOCK_PATH" in
461 ./*)
462 ;;
463
464 .)
465 NGX_LOCK_PATH=$NGX_PREFIX/logs/nginx.lock
466 ;;
467
468 *)
469 NGX_LOCK_PATH=$NGX_PREFIX/$NGX_LOCK_PATH
470 ;;
471 esac
472
473
474 case ".$NGX_ERROR_LOG_PATH" in
475 ./*)
476 ;;
477
478 .)
479 NGX_ERROR_LOG_PATH=$NGX_PREFIX/logs/error.log
480 ;;
481
482 .stderr)
483 NGX_ERROR_LOG_PATH=
484 ;;
485
486 *)
487 NGX_ERROR_LOG_PATH=$NGX_PREFIX/$NGX_ERROR_LOG_PATH
488 ;;
489 esac
490
491
492 case ".$NGX_HTTP_LOG_PATH" in
493 ./*)
494 ;;
495
496 .)
497 NGX_HTTP_LOG_PATH=$NGX_PREFIX/logs/access.log
498 ;;
499
500 *)
501 NGX_HTTP_LOG_PATH=$NGX_PREFIX/$NGX_HTTP_LOG_PATH
502 ;;
503 esac
504
505
506 case ".$NGX_HTTP_CLIENT_TEMP_PATH" in
507 ./*)
508 ;;
509
510 .)
511 NGX_HTTP_CLIENT_TEMP_PATH=$NGX_PREFIX/client_body_temp
512 ;;
513
514 *)
515 NGX_HTTP_CLIENT_TEMP_PATH=$NGX_PREFIX/$NGX_HTTP_CLIENT_TEMP_PATH
516 ;;
517 esac
518
519
520 case ".$NGX_HTTP_PROXY_TEMP_PATH" in
521 ./*)
522 ;;
523
524 .)
525 NGX_HTTP_PROXY_TEMP_PATH=$NGX_PREFIX/proxy_temp
526 ;;
527
528 *)
529 NGX_HTTP_PROXY_TEMP_PATH=$NGX_PREFIX/$NGX_HTTP_PROXY_TEMP_PATH
530 ;;
531 esac
532
533
534 case ".$NGX_HTTP_FASTCGI_TEMP_PATH" in
535 ./*)
536 ;;
537
538 .)
539 NGX_HTTP_FASTCGI_TEMP_PATH=$NGX_PREFIX/fastcgi_temp
540 ;;
541
542 *)
543 NGX_HTTP_FASTCGI_TEMP_PATH=$NGX_PREFIX/$NGX_HTTP_FASTCGI_TEMP_PATH
544 ;;
545 esac
546
547 434
548 case ".$NGX_PERL_MODULES" in 435 case ".$NGX_PERL_MODULES" in
549 ./*) 436 ./*)
550 ;; 437 ;;
551 438