mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-20 03:51:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Modules compatibility: upstream config field.

Browse Source 
It is to be used to track version of an upstream configuration used for
request processing.
This commit is contained in:
Maxim Dounin 2016-09-29 18:06:04 +03:00
parent e900019ac4
commit 7797fb04cd
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/ngx_http_upstream_round_robin.c
View File

@ -260,6 +260,7 @@ ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r,
rrp->peers = us->peer.data; rrp->peers = us->peer.data;
rrp->current = NULL; rrp->current = NULL;
rrp->config = 0;
n = rrp->peers->number; n = rrp->peers->number;
@ -384,6 +385,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
rrp->peers = peers; rrp->peers = peers;
rrp->current = NULL; rrp->current = NULL;
rrp->config = 0;
if (rrp->peers->number <= 8 * sizeof(uintptr_t)) { if (rrp->peers->number <= 8 * sizeof(uintptr_t)) {
rrp->tried = &rrp->data; rrp->tried = &rrp->data;

1
src/http/ngx_http_upstream_round_robin.h
View File

@ -122,6 +122,7 @@ struct ngx_http_upstream_rr_peers_s {
typedef struct { typedef struct {
ngx_uint_t config;
ngx_http_upstream_rr_peers_t *peers; ngx_http_upstream_rr_peers_t *peers;
ngx_http_upstream_rr_peer_t *current; ngx_http_upstream_rr_peer_t *current;
uintptr_t *tried; uintptr_t *tried;

2
src/stream/ngx_stream_upstream_round_robin.c
View File

@ -265,6 +265,7 @@ ngx_stream_upstream_init_round_robin_peer(ngx_stream_session_t *s,
rrp->peers = us->peer.data; rrp->peers = us->peer.data;
rrp->current = NULL; rrp->current = NULL;
rrp->config = 0;
n = rrp->peers->number; n = rrp->peers->number;
@ -391,6 +392,7 @@ ngx_stream_upstream_create_round_robin_peer(ngx_stream_session_t *s,
rrp->peers = peers; rrp->peers = peers;
rrp->current = NULL; rrp->current = NULL;
rrp->config = 0;
if (rrp->peers->number <= 8 * sizeof(uintptr_t)) { if (rrp->peers->number <= 8 * sizeof(uintptr_t)) {
rrp->tried = &rrp->data; rrp->tried = &rrp->data;

1
src/stream/ngx_stream_upstream_round_robin.h
View File

@ -122,6 +122,7 @@ struct ngx_stream_upstream_rr_peers_s {
typedef struct { typedef struct {
ngx_uint_t config;
ngx_stream_upstream_rr_peers_t *peers; ngx_stream_upstream_rr_peers_t *peers;
ngx_stream_upstream_rr_peer_t *current; ngx_stream_upstream_rr_peer_t *current;
uintptr_t *tried; uintptr_t *tried;