[PATCH 17 of 20] Upstream: handling of multiple Vary headers (ticket #1423)
Maxim Dounin
mdounin at mdounin.ru
Wed Apr 20 22:18:57 UTC 2022
# HG changeset patch
# User Maxim Dounin <mdounin at mdounin.ru>
# Date 1650492340 -10800
# Thu Apr 21 01:05:40 2022 +0300
# Node ID 2027b85971d4b8a7e33c018548468057cb57eaf7
# Parent f460a2f9f88d264ef6c8588eb37bcb85c48010db
Upstream: handling of multiple Vary headers (ticket #1423).
Previously, only the last header value was used when caching.
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -5175,6 +5175,9 @@ 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;
@@ -5192,17 +5195,47 @@ ngx_http_upstream_process_vary(ngx_http_
return NGX_OK;
}
- if (r->cache == NULL) {
+ if (r->cache == NULL || !u->cacheable) {
+ return NGX_OK;
+ }
+
+ if (h->value.len == 1 && h->value.data[0] == '*') {
+ u->cacheable = 0;
return NGX_OK;
}
- if (h->value.len > NGX_HTTP_CACHE_VARY_LEN
- || (h->value.len == 1 && h->value.data[0] == '*'))
- {
+ 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);
+ *p++ = ','; *p++ = ' ';
+ }
+
+ } else {
+ vary = h->value;
+ }
+
+ if (vary.len > NGX_HTTP_CACHE_VARY_LEN) {
u->cacheable = 0;
}
- r->cache->vary = h->value;
+ r->cache->vary = vary;
#endif
More information about the nginx-devel
mailing list