Mercurial > hg > nginx
comparison src/http/modules/ngx_http_scgi_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 | e3bcc2f4c418 |
children | 4b773fc06336 |
comparison
equal
deleted
inserted
replaced
3698:d11227f0107f | 3699:b0a0686a85bb |
---|---|
193 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, | 193 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, |
194 ngx_http_file_cache_set_slot, | 194 ngx_http_file_cache_set_slot, |
195 0, | 195 0, |
196 0, | 196 0, |
197 &ngx_http_scgi_module }, | 197 &ngx_http_scgi_module }, |
198 | |
199 { ngx_string("scgi_cache_bypass"), | |
200 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
201 ngx_http_set_predicate_slot, | |
202 NGX_HTTP_LOC_CONF_OFFSET, | |
203 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_bypass), | |
204 NULL }, | |
198 | 205 |
199 { ngx_string("scgi_no_cache"), | 206 { ngx_string("scgi_no_cache"), |
200 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | 207 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
201 ngx_http_set_predicate_slot, | 208 ngx_http_set_predicate_slot, |
202 NGX_HTTP_LOC_CONF_OFFSET, | 209 NGX_HTTP_LOC_CONF_OFFSET, |
1013 conf->upstream.pass_request_body = NGX_CONF_UNSET; | 1020 conf->upstream.pass_request_body = NGX_CONF_UNSET; |
1014 | 1021 |
1015 #if (NGX_HTTP_CACHE) | 1022 #if (NGX_HTTP_CACHE) |
1016 conf->upstream.cache = NGX_CONF_UNSET_PTR; | 1023 conf->upstream.cache = NGX_CONF_UNSET_PTR; |
1017 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; | 1024 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; |
1025 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR; | |
1018 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; | 1026 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; |
1019 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; | 1027 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; |
1020 #endif | 1028 #endif |
1021 | 1029 |
1022 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; | 1030 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; |
1232 conf->upstream.cache_methods = prev->upstream.cache_methods; | 1240 conf->upstream.cache_methods = prev->upstream.cache_methods; |
1233 } | 1241 } |
1234 | 1242 |
1235 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD; | 1243 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD; |
1236 | 1244 |
1245 ngx_conf_merge_ptr_value(conf->upstream.cache_bypass, | |
1246 prev->upstream.cache_bypass, NULL); | |
1247 | |
1237 ngx_conf_merge_ptr_value(conf->upstream.no_cache, | 1248 ngx_conf_merge_ptr_value(conf->upstream.no_cache, |
1238 prev->upstream.no_cache, NULL); | 1249 prev->upstream.no_cache, NULL); |
1239 | 1250 |
1240 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, | 1251 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, |
1241 prev->upstream.cache_valid, NULL); | 1252 prev->upstream.cache_valid, NULL); |