Mercurial > hg > nginx

comparison src/http/modules/ngx_http_uwsgi_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
375 { ngx_string("uwsgi_cache_revalidate"), 375 { ngx_string("uwsgi_cache_revalidate"),
376 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 376 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
377 ngx_conf_set_flag_slot, 377 ngx_conf_set_flag_slot,
378 NGX_HTTP_LOC_CONF_OFFSET, 378 NGX_HTTP_LOC_CONF_OFFSET,
379 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_revalidate), 379 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_revalidate),
380 NULL },
381
382 { ngx_string("uwsgi_cache_background_update"),
383 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
384 ngx_conf_set_flag_slot,
385 NGX_HTTP_LOC_CONF_OFFSET,
386 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.cache_background_update),
380 NULL }, 387 NULL },
381 388
382 #endif 389 #endif
383 390
384 { ngx_string("uwsgi_temp_path"), 391 { ngx_string("uwsgi_temp_path"),
1423 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; 1430 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
1424 conf->upstream.cache_lock = NGX_CONF_UNSET; 1431 conf->upstream.cache_lock = NGX_CONF_UNSET;
1425 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC; 1432 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
1426 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC; 1433 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
1427 conf->upstream.cache_revalidate = NGX_CONF_UNSET; 1434 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
1435 conf->upstream.cache_background_update = NGX_CONF_UNSET;
1428 #endif 1436 #endif
1429 1437
1430 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; 1438 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
1431 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; 1439 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
1432 1440
1717 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age, 1725 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age,
1718 prev->upstream.cache_lock_age, 5000); 1726 prev->upstream.cache_lock_age, 5000);
1719 1727
1720 ngx_conf_merge_value(conf->upstream.cache_revalidate, 1728 ngx_conf_merge_value(conf->upstream.cache_revalidate,
1721 prev->upstream.cache_revalidate, 0); 1729 prev->upstream.cache_revalidate, 0);
1730
1731 ngx_conf_merge_value(conf->upstream.cache_background_update,
1732 prev->upstream.cache_background_update, 0);
1722 1733
1723 #endif 1734 #endif
1724 1735
1725 ngx_conf_merge_value(conf->upstream.pass_request_headers, 1736 ngx_conf_merge_value(conf->upstream.pass_request_headers,
1726 prev->upstream.pass_request_headers, 1); 1737 prev->upstream.pass_request_headers, 1);