Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_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 919d230ecdbe
children 43ccaf8e8728
comparison
equal deleted inserted replaced
5390:919d230ecdbe 5391:e65be17e3a3e
2695 prev->upstream.cache_bypass, NULL); 2695 prev->upstream.cache_bypass, NULL);
2696 2696
2697 ngx_conf_merge_ptr_value(conf->upstream.no_cache, 2697 ngx_conf_merge_ptr_value(conf->upstream.no_cache,
2698 prev->upstream.no_cache, NULL); 2698 prev->upstream.no_cache, NULL);
2699 2699
2700 if (conf->upstream.no_cache && conf->upstream.cache_bypass == NULL) {
2701 ngx_log_error(NGX_LOG_WARN, cf->log, 0,
2702 "\"proxy_no_cache\" functionality has been changed in 0.8.46, "
2703 "now it should be used together with \"proxy_cache_bypass\"");
2704 }
2705
2706 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, 2700 ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
2707 prev->upstream.cache_valid, NULL); 2701 prev->upstream.cache_valid, NULL);
2708 2702
2709 if (conf->cache_key.value.data == NULL) { 2703 if (conf->cache_key.value.data == NULL) {
2710 conf->cache_key = prev->cache_key; 2704 conf->cache_key = prev->cache_key;