Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_module.c @ 6906:1aeaae6e9446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: proxy_cache_background_update and friends. The directives enable cache updates in subrequests.
author Roman Arutyunyan <arut@nginx.com>
date Fri, 10 Feb 2017 15:13:41 +0300
parents 0fba3ed4e7eb
children fa56ab75cffc
comparison
equal deleted inserted replaced
6905:9a9e13686869 6906:1aeaae6e9446
315 { ngx_string("scgi_cache_revalidate"), 315 { ngx_string("scgi_cache_revalidate"),
316 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 316 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
317 ngx_conf_set_flag_slot, 317 ngx_conf_set_flag_slot,
318 NGX_HTTP_LOC_CONF_OFFSET, 318 NGX_HTTP_LOC_CONF_OFFSET,
319 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_revalidate), 319 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_revalidate),
320 NULL },
321
322 { ngx_string("scgi_cache_background_update"),
323 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
324 ngx_conf_set_flag_slot,
325 NGX_HTTP_LOC_CONF_OFFSET,
326 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_background_update),
320 NULL }, 327 NULL },
321 328
322 #endif 329 #endif
323 330
324 { ngx_string("scgi_temp_path"), 331 { ngx_string("scgi_temp_path"),
1217 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; 1224 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
1218 conf->upstream.cache_lock = NGX_CONF_UNSET; 1225 conf->upstream.cache_lock = NGX_CONF_UNSET;
1219 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC; 1226 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
1220 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC; 1227 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
1221 conf->upstream.cache_revalidate = NGX_CONF_UNSET; 1228 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
1229 conf->upstream.cache_background_update = NGX_CONF_UNSET;
1222 #endif 1230 #endif
1223 1231
1224 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; 1232 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
1225 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; 1233 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
1226 1234
1503 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age, 1511 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age,
1504 prev->upstream.cache_lock_age, 5000); 1512 prev->upstream.cache_lock_age, 5000);
1505 1513
1506 ngx_conf_merge_value(conf->upstream.cache_revalidate, 1514 ngx_conf_merge_value(conf->upstream.cache_revalidate,
1507 prev->upstream.cache_revalidate, 0); 1515 prev->upstream.cache_revalidate, 0);
1516
1517 ngx_conf_merge_value(conf->upstream.cache_background_update,
1518 prev->upstream.cache_background_update, 0);
1508 1519
1509 #endif 1520 #endif
1510 1521
1511 ngx_conf_merge_value(conf->upstream.pass_request_headers, 1522 ngx_conf_merge_value(conf->upstream.pass_request_headers,
1512 prev->upstream.pass_request_headers, 1); 1523 prev->upstream.pass_request_headers, 1);