Mercurial > hg > nginx

comparison src/http/ngx_http_upstream_round_robin.h @ 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 d05ab8793a69
children 88a302caca75
comparison
equal deleted inserted replaced
4723:68ac485abbba 4724:0141b4aec0e4
39 39
40 40
41 typedef struct ngx_http_upstream_rr_peers_s ngx_http_upstream_rr_peers_t; 41 typedef struct ngx_http_upstream_rr_peers_s ngx_http_upstream_rr_peers_t;
42 42
43 struct ngx_http_upstream_rr_peers_s { 43 struct ngx_http_upstream_rr_peers_s {
44 ngx_uint_t single; /* unsigned single:1; */
45 ngx_uint_t number; 44 ngx_uint_t number;
46 ngx_uint_t last_cached; 45 ngx_uint_t last_cached;
47 46
48 /* ngx_mutex_t *mutex; */ 47 /* ngx_mutex_t *mutex; */
49 ngx_connection_t **cached; 48 ngx_connection_t **cached;
49
50 ngx_uint_t total_weight;
51
52 unsigned single:1;
53 unsigned weighted:1;
50 54
51 ngx_str_t *name; 55 ngx_str_t *name;
52 56
53 ngx_http_upstream_rr_peers_t *next; 57 ngx_http_upstream_rr_peers_t *next;
54 58