diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-09-29 18:06:04 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-09-29 18:06:04 +0300 |
| commit | 7797fb04cdcffd5ffb760cb7fd9ebdab7b74fde2 (patch) | |
| tree | 3b8a2d2f5bc7dff339449c11ad12dd67088187e2 /src | |
| parent | e900019ac44fdac60c819e03508a50da5602a42c (diff) | |
| download | nginx-7797fb04cdcffd5ffb760cb7fd9ebdab7b74fde2.tar.gz nginx-7797fb04cdcffd5ffb760cb7fd9ebdab7b74fde2.zip | |
Modules compatibility: upstream config field.
It is to be used to track version of an upstream configuration used for
request processing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_upstream_round_robin.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream_round_robin.h | 1 | ||||
| -rw-r--r-- | src/stream/ngx_stream_upstream_round_robin.c | 2 | ||||
| -rw-r--r-- | src/stream/ngx_stream_upstream_round_robin.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c index 501584d37..0137bf61a 100644 --- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -260,6 +260,7 @@ ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r, rrp->peers = us->peer.data; rrp->current = NULL; + rrp->config = 0; n = rrp->peers->number; @@ -384,6 +385,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, rrp->peers = peers; rrp->current = NULL; + rrp->config = 0; if (rrp->peers->number <= 8 * sizeof(uintptr_t)) { rrp->tried = &rrp->data; diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h index d0f163197..6323abfa3 100644 --- a/src/http/ngx_http_upstream_round_robin.h +++ b/src/http/ngx_http_upstream_round_robin.h @@ -122,6 +122,7 @@ struct ngx_http_upstream_rr_peers_s { typedef struct { + ngx_uint_t config; ngx_http_upstream_rr_peers_t *peers; ngx_http_upstream_rr_peer_t *current; uintptr_t *tried; diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c index 87ca301ce..3a62501a7 100644 --- a/src/stream/ngx_stream_upstream_round_robin.c +++ b/src/stream/ngx_stream_upstream_round_robin.c @@ -265,6 +265,7 @@ ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s, rrp->peers = us->peer.data; rrp->current = NULL; + rrp->config = 0; n = rrp->peers->number; @@ -391,6 +392,7 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s, rrp->peers = peers; rrp->current = NULL; + rrp->config = 0; if (rrp->peers->number <= 8 * sizeof(uintptr_t)) { rrp->tried = &rrp->data; diff --git a/src/stream/ngx_stream_upstream_round_robin.h b/src/stream/ngx_stream_upstream_round_robin.h index 8b5840809..9540c1278 100644 --- a/src/stream/ngx_stream_upstream_round_robin.h +++ b/src/stream/ngx_stream_upstream_round_robin.h @@ -122,6 +122,7 @@ struct ngx_stream_upstream_rr_peers_s { typedef struct { + ngx_uint_t config; ngx_stream_upstream_rr_peers_t *peers; ngx_stream_upstream_rr_peer_t *current; uintptr_t *tried; |