Mercurial > hg > nginx
comparison auto/modules @ 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 | 7cb78d9289b8 |
children | 09187f9b0950 613390a974df |
comparison
equal
deleted
inserted
replaced
4723:68ac485abbba | 4724:0141b4aec0e4 |
---|---|
343 if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then | 343 if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then |
344 HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_IP_HASH_MODULE" | 344 HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_IP_HASH_MODULE" |
345 HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS" | 345 HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS" |
346 fi | 346 fi |
347 | 347 |
348 if [ $HTTP_UPSTREAM_LEAST_CONN = YES ]; then | |
349 HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_LEAST_CONN_MODULE" | |
350 HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_LEAST_CONN_SRCS" | |
351 fi | |
352 | |
348 if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then | 353 if [ $HTTP_UPSTREAM_KEEPALIVE = YES ]; then |
349 HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_KEEPALIVE_MODULE" | 354 HTTP_MODULES="$HTTP_MODULES $HTTP_UPSTREAM_KEEPALIVE_MODULE" |
350 HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_KEEPALIVE_SRCS" | 355 HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_KEEPALIVE_SRCS" |
351 fi | 356 fi |
352 | 357 |