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/modules | |
| 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/modules')
| -rw-r--r-- | auto/modules | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/auto/modules b/auto/modules index 7d3216b0f..ebea30232 100644 --- a/auto/modules +++ b/auto/modules @@ -345,6 +345,11 @@ if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS" fi +if [ $HTTP_UPSTREAM_LEAST_CONN = YES ]; then + HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_LEAST_CONN_MODULE" + HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_LEAST_CONN_SRCS" +fi + if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_KEEPALIVE_MODULE" HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_KEEPALIVE_SRCS" |