Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 3700:e40453e6931b
add warnings for proxy_no_cache and fastcgi_no_cache
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 19 Jul 2010 09:55:43 +0000 |
parents | b0a0686a85bb |
children | 4b773fc06336 |
comparison
equal
deleted
inserted
replaced
3699:b0a0686a85bb | 3700:e40453e6931b |
---|---|
1914 prev->upstream.cache_bypass, NULL); | 1914 prev->upstream.cache_bypass, NULL); |
1915 | 1915 |
1916 ngx_conf_merge_ptr_value(conf->upstream.no_cache, | 1916 ngx_conf_merge_ptr_value(conf->upstream.no_cache, |
1917 prev->upstream.no_cache, NULL); | 1917 prev->upstream.no_cache, NULL); |
1918 | 1918 |
1919 if (conf->upstream.no_cache && conf->upstream.cache_bypass == NULL) { | |
1920 ngx_log_error(NGX_LOG_WARN, cf->log, 0, | |
1921 "\"proxy_no_cache\" functionality has been changed in 0.8.46, " | |
1922 "now it should be used together with \"proxy_cache_bypass\""); | |
1923 } | |
1924 | |
1919 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, | 1925 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, |
1920 prev->upstream.cache_valid, NULL); | 1926 prev->upstream.cache_valid, NULL); |
1921 | 1927 |
1922 if (conf->cache_key.value.data == NULL) { | 1928 if (conf->cache_key.value.data == NULL) { |
1923 conf->cache_key = prev->cache_key; | 1929 conf->cache_key = prev->cache_key; |