commit ad218a7845bb11313965ea5e5c24ec11faea1ab8
author Maxim Dounin <mdounin@mdounin.ru> Thu Sep 22 19:32:26 2016 +0300
committer Maxim Dounin <mdounin@mdounin.ru> Thu Sep 22 19:32:26 2016 +0300
tree de8c1d762796924048806d8f0e57b2d6405c3565
parent 07f2f08a2dbb98b8811a654b01e9d4d0f5d8247e

Upstream: introduced u->upstream.

It holds upstream{} block configuration, including ones selected via
run-time lookup using variables.

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 8ddc4e3..b8bf3f6 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -748,6 +748,8 @@
         return;
     }
 
+    u->upstream = uscf;
+
 #if (NGX_HTTP_SSL)
     u->ssl_name = uscf->host;
 #endif

src/http/ngx_http_upstream.h

diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index ef861f4..397c8d5 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -313,6 +313,7 @@
     ngx_chain_writer_ctx_t           writer;
 
     ngx_http_upstream_conf_t        *conf;
+    ngx_http_upstream_srv_conf_t    *upstream;
 #if (NGX_HTTP_CACHE)
     ngx_array_t                     *caches;
 #endif

src/stream/ngx_stream_proxy_module.c

diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index 2e90471..4231f97 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -521,6 +521,8 @@
         return;
     }
 
+    u->upstream = uscf;
+
 #if (NGX_STREAM_SSL)
     u->ssl_name = uscf->host;
 #endif

src/stream/ngx_stream_upstream.h

diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
index c97aace..1e9f08f 100644
--- a/src/stream/ngx_stream_upstream.h
+++ b/src/stream/ngx_stream_upstream.h
@@ -124,6 +124,7 @@
     ngx_str_t                          ssl_name;
 #endif
 
+    ngx_stream_upstream_srv_conf_t    *upstream;
     ngx_stream_upstream_resolved_t    *resolved;
     ngx_stream_upstream_state_t       *state;
     unsigned                           connected:1;