Mercurial > hg > nginx
changeset 6712:fd5c2781460b
Modules compatibility: upstream config field.
It is to be used to track version of an upstream configuration used for
request processing.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 29 Sep 2016 18:06:04 +0300 |
parents | 90a03b1dc4db |
children | 63b8b157b776 |
files | src/http/ngx_http_upstream_round_robin.c src/http/ngx_http_upstream_round_robin.h src/stream/ngx_stream_upstream_round_robin.c src/stream/ngx_stream_upstream_round_robin.h |
diffstat | 4 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream_round_robin.c Thu Sep 29 18:06:03 2016 +0300 +++ b/src/http/ngx_http_upstream_round_robin.c Thu Sep 29 18:06:04 2016 +0300 @@ -260,6 +260,7 @@ rrp->peers = us->peer.data; rrp->current = NULL; + rrp->config = 0; n = rrp->peers->number; @@ -384,6 +385,7 @@ rrp->peers = peers; rrp->current = NULL; + rrp->config = 0; if (rrp->peers->number <= 8 * sizeof(uintptr_t)) { rrp->tried = &rrp->data;
--- a/src/http/ngx_http_upstream_round_robin.h Thu Sep 29 18:06:03 2016 +0300 +++ b/src/http/ngx_http_upstream_round_robin.h Thu Sep 29 18:06:04 2016 +0300 @@ -122,6 +122,7 @@ typedef struct { + ngx_uint_t config; ngx_http_upstream_rr_peers_t *peers; ngx_http_upstream_rr_peer_t *current; uintptr_t *tried;
--- a/src/stream/ngx_stream_upstream_round_robin.c Thu Sep 29 18:06:03 2016 +0300 +++ b/src/stream/ngx_stream_upstream_round_robin.c Thu Sep 29 18:06:04 2016 +0300 @@ -265,6 +265,7 @@ rrp->peers = us->peer.data; rrp->current = NULL; + rrp->config = 0; n = rrp->peers->number; @@ -391,6 +392,7 @@ rrp->peers = peers; rrp->current = NULL; + rrp->config = 0; if (rrp->peers->number <= 8 * sizeof(uintptr_t)) { rrp->tried = &rrp->data;
--- a/src/stream/ngx_stream_upstream_round_robin.h Thu Sep 29 18:06:03 2016 +0300 +++ b/src/stream/ngx_stream_upstream_round_robin.h Thu Sep 29 18:06:04 2016 +0300 @@ -122,6 +122,7 @@ typedef struct { + ngx_uint_t config; ngx_stream_upstream_rr_peers_t *peers; ngx_stream_upstream_rr_peer_t *current; uintptr_t *tried;