Mercurial > hg > nginx

comparison src/http/modules/ngx_http_fastcgi_module.c @ 5391:e65be17e3a3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: proxy_no_cache, fastcgi_no_cache warnings removed.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 27 Sep 2013 16:50:13 +0400
parents 05c53652e7b4
children 8c827bb1b2b6
comparison
equal deleted inserted replaced
5390:919d230ecdbe 5391:e65be17e3a3e
2345 prev->upstream.cache_bypass, NULL); 2345 prev->upstream.cache_bypass, NULL);
2346 2346
2347 ngx_conf_merge_ptr_value(conf->upstream.no_cache, 2347 ngx_conf_merge_ptr_value(conf->upstream.no_cache,
2348 prev->upstream.no_cache, NULL); 2348 prev->upstream.no_cache, NULL);
2349 2349
2350 if (conf->upstream.no_cache && conf->upstream.cache_bypass == NULL) {
2351 ngx_log_error(NGX_LOG_WARN, cf->log, 0,
2352 "\"fastcgi_no_cache\" functionality has been changed in 0.8.46, "
2353 "now it should be used together with \"fastcgi_cache_bypass\"");
2354 }
2355
2356 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, 2350 ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
2357 prev->upstream.cache_valid, NULL); 2351 prev->upstream.cache_valid, NULL);
2358 2352
2359 if (conf->cache_key.value.data == NULL) { 2353 if (conf->cache_key.value.data == NULL) {
2360 conf->cache_key = prev->cache_key; 2354 conf->cache_key = prev->cache_key;