Mercurial > hg > nginx

comparison src/http/modules/ngx_http_fastcgi_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
467 ngx_conf_set_flag_slot, 467 ngx_conf_set_flag_slot,
468 NGX_HTTP_LOC_CONF_OFFSET, 468 NGX_HTTP_LOC_CONF_OFFSET,
469 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_revalidate), 469 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_revalidate),
470 NULL }, 470 NULL },
471 471
472 { ngx_string("fastcgi_cache_background_update"),
473 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
474 ngx_conf_set_flag_slot,
475 NGX_HTTP_LOC_CONF_OFFSET,
476 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_background_update),
477 NULL },
478
472 #endif 479 #endif
473 480
474 { ngx_string("fastcgi_temp_path"), 481 { ngx_string("fastcgi_temp_path"),
475 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, 482 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234,
476 ngx_conf_set_path_slot, 483 ngx_conf_set_path_slot,
2767 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; 2774 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
2768 conf->upstream.cache_lock = NGX_CONF_UNSET; 2775 conf->upstream.cache_lock = NGX_CONF_UNSET;
2769 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC; 2776 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
2770 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC; 2777 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
2771 conf->upstream.cache_revalidate = NGX_CONF_UNSET; 2778 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
2779 conf->upstream.cache_background_update = NGX_CONF_UNSET;
2772 #endif 2780 #endif
2773 2781
2774 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; 2782 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
2775 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; 2783 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
2776 2784
3058 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age, 3066 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age,
3059 prev->upstream.cache_lock_age, 5000); 3067 prev->upstream.cache_lock_age, 5000);
3060 3068
3061 ngx_conf_merge_value(conf->upstream.cache_revalidate, 3069 ngx_conf_merge_value(conf->upstream.cache_revalidate,
3062 prev->upstream.cache_revalidate, 0); 3070 prev->upstream.cache_revalidate, 0);
3071
3072 ngx_conf_merge_value(conf->upstream.cache_background_update,
3073 prev->upstream.cache_background_update, 0);
3063 3074
3064 #endif 3075 #endif
3065 3076
3066 ngx_conf_merge_value(conf->upstream.pass_request_headers, 3077 ngx_conf_merge_value(conf->upstream.pass_request_headers,
3067 prev->upstream.pass_request_headers, 1); 3078 prev->upstream.pass_request_headers, 1);