Mercurial > hg > nginx-vendor-0-8
diff auto/options @ 324:f7cd062ee035 NGINX_0_6_6
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 |
line wrap: on
line diff
--- a/auto/options +++ b/auto/options @@ -6,6 +6,7 @@ help=no NGX_PREFIX= NGX_SBIN_PATH= +NGX_CONF_PREFIX= NGX_CONF_PATH= NGX_ERROR_LOG_PATH= NGX_PID_PATH= @@ -123,6 +124,7 @@ do --prefix=*) NGX_PREFIX="$value" ;; --sbin-path=*) NGX_SBIN_PATH="$value" ;; + --sysconfdir=*) NGX_CONF_PREFIX="$value" ;; --conf-path=*) NGX_CONF_PATH="$value" ;; --error-log-path=*) NGX_ERROR_LOG_PATH="$value";; --pid-path=*) NGX_PID_PATH="$value" ;; @@ -240,6 +242,7 @@ cat << END --prefix=PATH set the installation prefix --sbin-path=PATH set path to the nginx binary file + --sysconfdir=PATH set the configuration prefix --conf-path=PATH set path to the nginx.conf file --error-log-path=PATH set path to the error log --pid-path=PATH set path to nginx.pid file @@ -360,6 +363,7 @@ fi NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx} +NGX_CONF_PREFIX=${NGX_CONF_PREFIX:-$NGX_PREFIX} case ".$NGX_SBIN_PATH" in @@ -381,11 +385,11 @@ case ".$NGX_CONF_PATH" in ;; .) - NGX_CONF_PATH=$NGX_PREFIX/conf/nginx.conf + NGX_CONF_PATH=$NGX_CONF_PREFIX/conf/nginx.conf ;; *) - NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH + NGX_CONF_PATH=$NGX_CONF_PREFIX/$NGX_CONF_PATH ;; esac