Mercurial > hg > nginx-vendor-current

comparison auto/options @ 324:f7cd062ee035 NGINX_0_6_6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.6 *) Feature: the --sysconfdir=PATH option in configure. *) Feature: named locations. *) Feature: the $args variable can be set with the "set" directive. *) Feature: the $is_args variable. *) Bugfix: fair big weight upstream balancer. *) Bugfix: if a client has closed connection to mail proxy then nginx might not close connection to backend. *) Bugfix: if the same host without specified port was used as backend for HTTP and HTTPS, then nginx used only one port - 80 or 443. *) Bugfix: fix building on Solaris/amd64 by Sun Studio 11 and early versions; bug appeared in 0.6.4.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Jul 2007 00:00:00 +0400
parents cba14c1e2a4b
children 9fc4ab6673f9
comparison
equal deleted inserted replaced
323:7e977a664d91 324:f7cd062ee035
4 4
5 help=no 5 help=no
6 6
7 NGX_PREFIX= 7 NGX_PREFIX=
8 NGX_SBIN_PATH= 8 NGX_SBIN_PATH=
9 NGX_CONF_PREFIX=
9 NGX_CONF_PATH= 10 NGX_CONF_PATH=
10 NGX_ERROR_LOG_PATH= 11 NGX_ERROR_LOG_PATH=
11 NGX_PID_PATH= 12 NGX_PID_PATH=
12 NGX_LOCK_PATH= 13 NGX_LOCK_PATH=
13 NGX_USER= 14 NGX_USER=
121 case "$option" in 122 case "$option" in
122 --help) help=yes ;; 123 --help) help=yes ;;
123 124
124 --prefix=*) NGX_PREFIX="$value" ;; 125 --prefix=*) NGX_PREFIX="$value" ;;
125 --sbin-path=*) NGX_SBIN_PATH="$value" ;; 126 --sbin-path=*) NGX_SBIN_PATH="$value" ;;
127 --sysconfdir=*) NGX_CONF_PREFIX="$value" ;;
126 --conf-path=*) NGX_CONF_PATH="$value" ;; 128 --conf-path=*) NGX_CONF_PATH="$value" ;;
127 --error-log-path=*) NGX_ERROR_LOG_PATH="$value";; 129 --error-log-path=*) NGX_ERROR_LOG_PATH="$value";;
128 --pid-path=*) NGX_PID_PATH="$value" ;; 130 --pid-path=*) NGX_PID_PATH="$value" ;;
129 --lock-path=*) NGX_LOCK_PATH="$value" ;; 131 --lock-path=*) NGX_LOCK_PATH="$value" ;;
130 --user=*) NGX_USER="$value" ;; 132 --user=*) NGX_USER="$value" ;;
238 240
239 --help this message 241 --help this message
240 242
241 --prefix=PATH set the installation prefix 243 --prefix=PATH set the installation prefix
242 --sbin-path=PATH set path to the nginx binary file 244 --sbin-path=PATH set path to the nginx binary file
245 --sysconfdir=PATH set the configuration prefix
243 --conf-path=PATH set path to the nginx.conf file 246 --conf-path=PATH set path to the nginx.conf file
244 --error-log-path=PATH set path to the error log 247 --error-log-path=PATH set path to the error log
245 --pid-path=PATH set path to nginx.pid file 248 --pid-path=PATH set path to nginx.pid file
246 --lock-path=PATH set path to nginx.lock file 249 --lock-path=PATH set path to nginx.lock file
247 250
358 NGX_WINE=$WINE 361 NGX_WINE=$WINE
359 fi 362 fi
360 363
361 364
362 NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx} 365 NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx}
366 NGX_CONF_PREFIX=${NGX_CONF_PREFIX:-$NGX_PREFIX}
363 367
364 368
365 case ".$NGX_SBIN_PATH" in 369 case ".$NGX_SBIN_PATH" in
366 ./*) 370 ./*)
367 ;; 371 ;;
379 case ".$NGX_CONF_PATH" in 383 case ".$NGX_CONF_PATH" in
380 ./*) 384 ./*)
381 ;; 385 ;;
382 386
383 .) 387 .)
384 NGX_CONF_PATH=$NGX_PREFIX/conf/nginx.conf 388 NGX_CONF_PATH=$NGX_CONF_PREFIX/conf/nginx.conf
385 ;; 389 ;;
386 390
387 *) 391 *)
388 NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH 392 NGX_CONF_PATH=$NGX_CONF_PREFIX/$NGX_CONF_PATH
389 ;; 393 ;;
390 esac 394 esac
391 395
392 396
393 case ".$NGX_PID_PATH" in 397 case ".$NGX_PID_PATH" in