[nginx] Upstream: fixed build without http cache (broken by cd73509f21e2).

Sergey Kandaurov pluknet at nginx.com
Mon May 30 22:33:11 UTC 2022


details:   https://hg.nginx.org/nginx/rev/e0cfab501dd1
branches:  
changeset: 8040:e0cfab501dd1
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Tue May 31 00:14:11 2022 +0300
description:
Upstream: fixed build without http cache (broken by cd73509f21e2).

diffstat:

 src/http/ngx_http_upstream.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r e64a1f32065b -r e0cfab501dd1 src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c	Mon May 30 21:25:57 2022 +0300
+++ b/src/http/ngx_http_upstream.c	Tue May 31 00:14:11 2022 +0300
@@ -5183,9 +5183,6 @@ static ngx_int_t
 ngx_http_upstream_process_vary(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset)
 {
-    u_char                *p;
-    size_t                 len;
-    ngx_str_t              vary;
     ngx_table_elt_t      **ph;
     ngx_http_upstream_t   *u;
 
@@ -5198,6 +5195,10 @@ ngx_http_upstream_process_vary(ngx_http_
     h->next = NULL;
 
 #if (NGX_HTTP_CACHE)
+    {
+    u_char     *p;
+    size_t      len;
+    ngx_str_t   vary;
 
     if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_VARY) {
         return NGX_OK;
@@ -5249,7 +5250,7 @@ ngx_http_upstream_process_vary(ngx_http_
     }
 
     r->cache->vary = vary;
-
+    }
 #endif
 
     return NGX_OK;



More information about the nginx-devel mailing list