Mercurial > hg > nginx

changeset 2661:8ace9dee8824

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge fastcgi_cache_key
author Igor Sysoev <igor@sysoev.ru>
date Thu, 02 Apr 2009 13:48:54 +0000
parents 2ca36a62c8a1
children 40f9def49ed5
files src/http/modules/ngx_http_fastcgi_module.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
     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,