nginx: src/http/ngx_http_upstream.c comparison

Upstream: handling of multiple Vary headers (ticket #1423). Previously, only the last header value was used when caching.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Mon, 30 May 2022 21:25:51 +0300
parents	413dbda22f7d
children	f739c8142fb2

comparison

equal deleted inserted replaced

-:413dbda22f7d
+:cd73509f21e2
 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;
 u = r->upstream;
 ph = &u->headers_in.vary;
 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_VARY) {
 return NGX_OK;
 }
-if (r->cache == NULL) {
+if (r->cache == NULL || !u->cacheable) {
 return NGX_OK;
 }
-if (h->value.len > NGX_HTTP_CACHE_VARY_LEN
+if (h->value.len == 1 && h->value.data[0] == '*') {
-|| (h->value.len == 1 && h->value.data[0] == '*'))
-{
 u->cacheable = 0;
-}
+return NGX_OK;
+}
-r->cache->vary = h->value;
+if (u->headers_in.vary->next) {
+len = 0;
+for (h = u->headers_in.vary; h; h = h->next) {
+len += h->value.len + 2;
+}
+len -= 2;
+p = ngx_pnalloc(r->pool, len);
+if (p == NULL) {
+return NGX_ERROR;
+}
+vary.len = len;
+vary.data = p;
+for (h = u->headers_in.vary; h; h = h->next) {
+p = ngx_copy(p, h->value.data, h->value.len);
+if (h->next == NULL) {
+break;
+}
+*p++ = ','; *p++ = ' ';
+}
+} else {
+vary = h->value;
+}
+if (vary.len > NGX_HTTP_CACHE_VARY_LEN) {
+u->cacheable = 0;
+}
+r->cache->vary = vary;
 #endif
 return NGX_OK;
 }

Mercurial > hg > nginx