diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-07-02 16:41:13 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-07-02 16:41:13 +0000 |
| commit | eaf3544e15cc7551efa128ed5bb67851cb57d11e (patch) | |
| tree | e20e507b071e05890536f6d91319ffcaa0858ffa /auto/options | |
| parent | bb612f1336ec34f6f73f5b4b0b8cb3d9fb99e53f (diff) | |
| download | nginx-eaf3544e15cc7551efa128ed5bb67851cb57d11e.tar.gz nginx-eaf3544e15cc7551efa128ed5bb67851cb57d11e.tar.bz2 | |
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.
Diffstat (limited to 'auto/options')
| -rw-r--r-- | auto/options | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/auto/options b/auto/options index 393be4066..11f23c6d6 100644 --- a/auto/options +++ b/auto/options @@ -96,6 +96,7 @@ HTTP_FLV=NO HTTP_MP4=NO HTTP_GZIP_STATIC=NO HTTP_UPSTREAM_IP_HASH=YES +HTTP_UPSTREAM_LEAST_CONN=YES HTTP_UPSTREAM_KEEPALIVE=YES # STUB @@ -243,6 +244,8 @@ use the \"--without-http_limit_conn_module\" option instead" --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;; --without-http_browser_module) HTTP_BROWSER=NO ;; --without-http_upstream_ip_hash_module) HTTP_UPSTREAM_IP_HASH=NO ;; + --without-http_upstream_least_conn_module) + HTTP_UPSTREAM_LEAST_CONN=NO ;; --without-http_upstream_keepalive_module) HTTP_UPSTREAM_KEEPALIVE=NO ;; --with-http_perl_module) HTTP_PERL=YES ;; |