diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-02 13:48:54 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-02 13:48:54 +0000 |
| commit | ca2bf870d8af43fffc5d0eaff1556d1ce18c38d3 (patch) | |
| tree | f15ffee33cc72de12d1164e22fcbe18b6b19dd33 | |
| parent | c919d3178a8e680406c02c609bc8d8e18f32f566 (diff) | |
| download | nginx-ca2bf870d8af43fffc5d0eaff1556d1ce18c38d3.tar.gz nginx-ca2bf870d8af43fffc5d0eaff1556d1ce18c38d3.zip | |
merge fastcgi_cache_key
| -rw-r--r-- | src/http/modules/ngx_http_fastcgi_module.c | 4 |
1 files changed, 4 insertions, 0 deletions
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, |