Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_module.c @ 2661:8ace9dee8824
merge fastcgi_cache_key
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 02 Apr 2009 13:48:54 +0000 |
parents | 4ed2fa197a4a |
children | d5896f6608e8 |
comparison
equal
deleted
inserted
replaced
2660:2ca36a62c8a1 | 2661:8ace9dee8824 |
---|---|
2062 } | 2062 } |
2063 | 2063 |
2064 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, | 2064 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, |
2065 prev->upstream.cache_valid, NULL); | 2065 prev->upstream.cache_valid, NULL); |
2066 | 2066 |
2067 if (conf->cache_key.value.data == NULL) { | |
2068 conf->cache_key = prev->cache_key; | |
2069 } | |
2070 | |
2067 #endif | 2071 #endif |
2068 | 2072 |
2069 ngx_conf_merge_value(conf->upstream.pass_request_headers, | 2073 ngx_conf_merge_value(conf->upstream.pass_request_headers, |
2070 prev->upstream.pass_request_headers, 1); | 2074 prev->upstream.pass_request_headers, 1); |
2071 ngx_conf_merge_value(conf->upstream.pass_request_body, | 2075 ngx_conf_merge_value(conf->upstream.pass_request_body, |