From ca2bf870d8af43fffc5d0eaff1556d1ce18c38d3 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 2 Apr 2009 13:48:54 +0000 Subject: merge fastcgi_cache_key --- src/http/modules/ngx_http_fastcgi_module.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c index 773707d7e..dfa5346f5 100644 --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -2064,6 +2064,10 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_ptr_value(conf->upstream.cache_valid, prev->upstream.cache_valid, NULL); + if (conf->cache_key.value.data == NULL) { + conf->cache_key = prev->cache_key; + } + #endif ngx_conf_merge_value(conf->upstream.pass_request_headers, -- cgit