Mercurial > hg > nginx

comparison auto/sources @ 4724:0141b4aec0e4 stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f31162fefe01
children f9ae534ebf4b
comparison
equal deleted inserted replaced
4723:68ac485abbba 4724:0141b4aec0e4
477 477
478 HTTP_UPSTREAM_IP_HASH_MODULE=ngx_http_upstream_ip_hash_module 478 HTTP_UPSTREAM_IP_HASH_MODULE=ngx_http_upstream_ip_hash_module
479 HTTP_UPSTREAM_IP_HASH_SRCS=src/http/modules/ngx_http_upstream_ip_hash_module.c 479 HTTP_UPSTREAM_IP_HASH_SRCS=src/http/modules/ngx_http_upstream_ip_hash_module.c
480 480
481 481
482 HTTP_UPSTREAM_LEAST_CONN_MODULE=ngx_http_upstream_least_conn_module
483 HTTP_UPSTREAM_LEAST_CONN_SRCS=" \
484 src/http/modules/ngx_http_upstream_least_conn_module.c"
485
486
482 HTTP_UPSTREAM_KEEPALIVE_MODULE=ngx_http_upstream_keepalive_module 487 HTTP_UPSTREAM_KEEPALIVE_MODULE=ngx_http_upstream_keepalive_module
483 HTTP_UPSTREAM_KEEPALIVE_SRCS=" \ 488 HTTP_UPSTREAM_KEEPALIVE_SRCS=" \
484 src/http/modules/ngx_http_upstream_keepalive_module.c" 489 src/http/modules/ngx_http_upstream_keepalive_module.c"
485 490
486 491