Mercurial > hg > nginx

changeset 6697:52367732bcbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream hash: fixed missing upstream name initialization.
author Vladimir Homutov <vl@nginx.com>
date Fri, 16 Sep 2016 15:13:24 +0300
parents e83540f825cd
children e8d4c9e9682a
files src/http/modules/ngx_http_upstream_hash_module.c src/stream/ngx_stream_upstream_hash_module.c
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_upstream_hash_module.c
+++ b/src/http/modules/ngx_http_upstream_hash_module.c
@@ -571,6 +571,7 @@ ngx_http_upstream_get_chash_peer(ngx_pee
         hp->tries++;
 
         if (hp->tries >= points->number) {
+            pc->name = hp->rrp.peers->name;
             ngx_http_upstream_rr_peers_unlock(hp->rrp.peers);
             return NGX_BUSY;
         }
--- a/src/stream/ngx_stream_upstream_hash_module.c
+++ b/src/stream/ngx_stream_upstream_hash_module.c
@@ -572,6 +572,7 @@ ngx_stream_upstream_get_chash_peer(ngx_p
         hp->tries++;
 
         if (hp->tries >= points->number) {
+            pc->name = hp->rrp.peers->name;
             ngx_stream_upstream_rr_peers_unlock(hp->rrp.peers);
             return NGX_BUSY;
         }