IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed proxy_set_header inheritance with proxy_cache (ticket #45).

Browse Source 
Headers cleared with cache enabled (If-Modified-Since etc.) might be cleared
in unrelated servers/locations without proxy_cache enabled if proxy_cache was
used in some server/location.

Example config which triggered the problem:

    proxy_set_header X-Test "test";
    server { location /1 { proxy_cache name; proxy_pass ... } }
    server { location /2 { proxy_pass ... } }

Another one:

    server {
        proxy_cache name;
        location /1 { proxy_pass ... }
        location /2 { proxy_cache off; proxy_pass ... }
    }

In both cases If-Modified-Since header wasn't sent to backend in location /2.

Fix is to not modify conf->headers_source, but instead merge user-supplied
headers from conf->headers_source and default headers (either cache or not)
into separate headers_merged array.
This commit is contained in:
Maxim Dounin
2011-11-14 13:18:15 +00:00
parent 66a60a62cc
commit b5984de06b
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/http/modules/ngx_http_proxy_module.c
View File

@@ -2875,7 +2875,7 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
size_t size; size_t size;
uintptr_t *code; uintptr_t *code;
ngx_uint_t i; ngx_uint_t i;
ngx_array_t headers_names; ngx_array_t headers_names, headers_merged;
ngx_keyval_t *src, *s, *h; ngx_keyval_t *src, *s, *h;
ngx_hash_key_t *hk; ngx_hash_key_t *hk;
ngx_hash_init_t hash; ngx_hash_init_t hash;
@@ -2906,6 +2906,12 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
return NGX_ERROR; return NGX_ERROR;
} }
if (ngx_array_init(&headers_merged, cf->temp_pool, 4, sizeof(ngx_keyval_t))
!= NGX_OK)
{
return NGX_ERROR;
}
if (conf->headers_source == NULL) { if (conf->headers_source == NULL) {
conf->headers_source = ngx_array_create(cf->pool, 4, conf->headers_source = ngx_array_create(cf->pool, 4,
sizeof(ngx_keyval_t)); sizeof(ngx_keyval_t));
@@ -2925,8 +2931,6 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
} }
src = conf->headers_source->elts;
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
h = conf->upstream.cache ? ngx_http_proxy_cache_headers: h = conf->upstream.cache ? ngx_http_proxy_cache_headers:
@@ -2937,31 +2941,41 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
#endif #endif
src = conf->headers_source->elts;
for (i = 0; i < conf->headers_source->nelts; i++) {
s = ngx_array_push(&headers_merged);
if (s == NULL) {
return NGX_ERROR;
}
*s = src[i];
}
while (h->key.len) { while (h->key.len) {
for (i = 0; i < conf->headers_source->nelts; i++) { src = headers_merged.elts;
for (i = 0; i < headers_merged.nelts; i++) {
if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) { if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) {
goto next; goto next;
} }
} }
s = ngx_array_push(conf->headers_source); s = ngx_array_push(&headers_merged);
if (s == NULL) { if (s == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
*s = *h; *s = *h;
src = conf->headers_source->elts;
next: next:
h++; h++;
} }
src = conf->headers_source->elts; src = headers_merged.elts;
for (i = 0; i < conf->headers_source->nelts; i++) { for (i = 0; i < headers_merged.nelts; i++) {
hk = ngx_array_push(&headers_names); hk = ngx_array_push(&headers_names);
if (hk == NULL) { if (hk == NULL) {