Mercurial > hg > nginx

comparison src/http/modules/ngx_http_uwsgi_module.c @ 3699:b0a0686a85bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
220 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, 220 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE,
221 ngx_http_file_cache_set_slot, 221 ngx_http_file_cache_set_slot,
222 0, 222 0,
223 0, 223 0,
224 &ngx_http_uwsgi_module }, 224 &ngx_http_uwsgi_module },
225
226 { ngx_string("uwsgi_cache_bypass"),
227 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
228 ngx_http_set_predicate_slot,
229 NGX_HTTP_LOC_CONF_OFFSET,
230 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_bypass),
231 NULL },
225 232
226 { ngx_string("uwsgi_no_cache"), 233 { ngx_string("uwsgi_no_cache"),
227 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, 234 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
228 ngx_http_set_predicate_slot, 235 ngx_http_set_predicate_slot,
229 NGX_HTTP_LOC_CONF_OFFSET, 236 NGX_HTTP_LOC_CONF_OFFSET,
1066 conf->upstream.pass_request_body = NGX_CONF_UNSET; 1073 conf->upstream.pass_request_body = NGX_CONF_UNSET;
1067 1074
1068 #if (NGX_HTTP_CACHE) 1075 #if (NGX_HTTP_CACHE)
1069 conf->upstream.cache = NGX_CONF_UNSET_PTR; 1076 conf->upstream.cache = NGX_CONF_UNSET_PTR;
1070 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; 1077 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
1078 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
1071 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; 1079 conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
1072 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; 1080 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
1073 #endif 1081 #endif
1074 1082
1075 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; 1083 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
1285 conf->upstream.cache_methods = prev->upstream.cache_methods; 1293 conf->upstream.cache_methods = prev->upstream.cache_methods;
1286 } 1294 }
1287 1295
1288 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD; 1296 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD;
1289 1297
1298 ngx_conf_merge_ptr_value(conf->upstream.cache_bypass,
1299 prev->upstream.cache_bypass, NULL);
1300
1290 ngx_conf_merge_ptr_value(conf->upstream.no_cache, 1301 ngx_conf_merge_ptr_value(conf->upstream.no_cache,
1291 prev->upstream.no_cache, NULL); 1302 prev->upstream.no_cache, NULL);
1292 1303
1293 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, 1304 ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
1294 prev->upstream.cache_valid, NULL); 1305 prev->upstream.cache_valid, NULL);