Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 3699:b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 19 Jul 2010 09:36:04 +0000 |
parents | 045ea40cbfe8 |
children | e40453e6931b |
comparison
equal
deleted
inserted
replaced
3698:d11227f0107f | 3699:b0a0686a85bb |
---|---|
336 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, | 336 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, |
337 ngx_http_file_cache_set_slot, | 337 ngx_http_file_cache_set_slot, |
338 0, | 338 0, |
339 0, | 339 0, |
340 &ngx_http_proxy_module }, | 340 &ngx_http_proxy_module }, |
341 | |
342 { ngx_string("proxy_cache_bypass"), | |
343 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
344 ngx_http_set_predicate_slot, | |
345 NGX_HTTP_LOC_CONF_OFFSET, | |
346 offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_bypass), | |
347 NULL }, | |
341 | 348 |
342 { ngx_string("proxy_no_cache"), | 349 { ngx_string("proxy_no_cache"), |
343 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | 350 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
344 ngx_http_set_predicate_slot, | 351 ngx_http_set_predicate_slot, |
345 NGX_HTTP_LOC_CONF_OFFSET, | 352 NGX_HTTP_LOC_CONF_OFFSET, |
1676 conf->upstream.pass_request_body = NGX_CONF_UNSET; | 1683 conf->upstream.pass_request_body = NGX_CONF_UNSET; |
1677 | 1684 |
1678 #if (NGX_HTTP_CACHE) | 1685 #if (NGX_HTTP_CACHE) |
1679 conf->upstream.cache = NGX_CONF_UNSET_PTR; | 1686 conf->upstream.cache = NGX_CONF_UNSET_PTR; |
1680 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; | 1687 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; |
1688 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR; | |
1681 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; | 1689 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; |
1682 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; | 1690 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; |
1683 #endif | 1691 #endif |
1684 | 1692 |
1685 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; | 1693 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; |
1899 | 1907 |
1900 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { | 1908 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { |
1901 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET | 1909 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET |
1902 |NGX_HTTP_UPSTREAM_FT_OFF; | 1910 |NGX_HTTP_UPSTREAM_FT_OFF; |
1903 } | 1911 } |
1912 | |
1913 ngx_conf_merge_ptr_value(conf->upstream.cache_bypass, | |
1914 prev->upstream.cache_bypass, NULL); | |
1904 | 1915 |
1905 ngx_conf_merge_ptr_value(conf->upstream.no_cache, | 1916 ngx_conf_merge_ptr_value(conf->upstream.no_cache, |
1906 prev->upstream.no_cache, NULL); | 1917 prev->upstream.no_cache, NULL); |
1907 | 1918 |
1908 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, | 1919 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, |