]> git.kaiwu.me - nginx.git/commitdiff
merge fastcgi_cache_key
authorIgor Sysoev <igor@sysoev.ru>
Thu, 2 Apr 2009 13:48:54 +0000 (13:48 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Thu, 2 Apr 2009 13:48:54 +0000 (13:48 +0000)
src/http/modules/ngx_http_fastcgi_module.c

index 773707d7eadd45bb0bac91e8eb51c1e97685d821..dfa5346f58087a680be5009d83ce3a80738a0234 100644 (file)
@@ -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,