# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1238680134 0
# Node ID 8ace9dee882406c161865603d6ee4617a8c70217
# Parent  2ca36a62c8a15b520ed3fba2801733cb625b8bab
merge fastcgi_cache_key

diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
--- 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,