merge fastcgi_cache_key

This commit is contained in:
Igor Sysoev 2009-04-02 13:48:54 +00:00
parent c919d3178a
commit ca2bf870d8

View 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,