Mercurial > hg > nginx-quic
comparison auto/options @ 4724:0141b4aec0e4 stable-1.2
Merge of r4655, r4656, r4657, r4695, r4696: upstream changes.
*) Upstream: least_conn balancer module.
*) Upstream: weights and IPv6 support in ip_hash balancer.
*) Upstream keepalive: "single" parameter deprecated.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 02 Jul 2012 16:41:13 +0000 |
parents | d620f497c50f |
children | f9ae534ebf4b 6b4b702316a6 |
comparison
equal
deleted
inserted
replaced
4723:68ac485abbba | 4724:0141b4aec0e4 |
---|---|
94 HTTP_DEGRADATION=NO | 94 HTTP_DEGRADATION=NO |
95 HTTP_FLV=NO | 95 HTTP_FLV=NO |
96 HTTP_MP4=NO | 96 HTTP_MP4=NO |
97 HTTP_GZIP_STATIC=NO | 97 HTTP_GZIP_STATIC=NO |
98 HTTP_UPSTREAM_IP_HASH=YES | 98 HTTP_UPSTREAM_IP_HASH=YES |
99 HTTP_UPSTREAM_LEAST_CONN=YES | |
99 HTTP_UPSTREAM_KEEPALIVE=YES | 100 HTTP_UPSTREAM_KEEPALIVE=YES |
100 | 101 |
101 # STUB | 102 # STUB |
102 HTTP_STUB_STATUS=NO | 103 HTTP_STUB_STATUS=NO |
103 | 104 |
241 --without-http_limit_conn_module) HTTP_LIMIT_CONN=NO ;; | 242 --without-http_limit_conn_module) HTTP_LIMIT_CONN=NO ;; |
242 --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;; | 243 --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;; |
243 --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;; | 244 --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;; |
244 --without-http_browser_module) HTTP_BROWSER=NO ;; | 245 --without-http_browser_module) HTTP_BROWSER=NO ;; |
245 --without-http_upstream_ip_hash_module) HTTP_UPSTREAM_IP_HASH=NO ;; | 246 --without-http_upstream_ip_hash_module) HTTP_UPSTREAM_IP_HASH=NO ;; |
247 --without-http_upstream_least_conn_module) | |
248 HTTP_UPSTREAM_LEAST_CONN=NO ;; | |
246 --without-http_upstream_keepalive_module) HTTP_UPSTREAM_KEEPALIVE=NO ;; | 249 --without-http_upstream_keepalive_module) HTTP_UPSTREAM_KEEPALIVE=NO ;; |
247 | 250 |
248 --with-http_perl_module) HTTP_PERL=YES ;; | 251 --with-http_perl_module) HTTP_PERL=YES ;; |
249 --with-perl_modules_path=*) NGX_PERL_MODULES="$value" ;; | 252 --with-perl_modules_path=*) NGX_PERL_MODULES="$value" ;; |
250 --with-perl=*) NGX_PERL="$value" ;; | 253 --with-perl=*) NGX_PERL="$value" ;; |