merge fastcgi_cache_key

2009-04-02 13:48:54 +00:00 · 2009-04-02 13:48:54 +00:00 · 6fb7a68e98
commit 6fb7a68e98
parent a4d4842b11
1 changed files with 4 additions and 0 deletions
--- 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,