mirror of
https://github.com/nginx/nginx.git
synced 2024-12-04 22:09:01 +08:00
proxy_no_cache and fastcgi_no_cache
This commit is contained in:
parent
fbb262533f
commit
9b2763a245
@ -336,6 +336,13 @@ static ngx_command_t ngx_http_fastcgi_commands[] = {
|
||||
0,
|
||||
&ngx_http_fastcgi_module },
|
||||
|
||||
{ ngx_string("fastcgi_no_cache"),
|
||||
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
|
||||
ngx_http_no_cache_set_slot,
|
||||
NGX_HTTP_LOC_CONF_OFFSET,
|
||||
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.no_cache),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("fastcgi_cache_valid"),
|
||||
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
|
||||
ngx_http_file_cache_valid_set_slot,
|
||||
@ -1923,6 +1930,7 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
|
||||
#if (NGX_HTTP_CACHE)
|
||||
conf->upstream.cache = NGX_CONF_UNSET_PTR;
|
||||
conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
|
||||
conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
|
||||
conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
|
||||
#endif
|
||||
|
||||
@ -2144,6 +2152,9 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||
|
||||
conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD;
|
||||
|
||||
ngx_conf_merge_ptr_value(conf->upstream.no_cache,
|
||||
prev->upstream.no_cache, NULL);
|
||||
|
||||
ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
|
||||
prev->upstream.cache_valid, NULL);
|
||||
|
||||
|
@ -359,6 +359,13 @@ static ngx_command_t ngx_http_proxy_commands[] = {
|
||||
0,
|
||||
&ngx_http_proxy_module },
|
||||
|
||||
{ ngx_string("proxy_no_cache"),
|
||||
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
|
||||
ngx_http_no_cache_set_slot,
|
||||
NGX_HTTP_LOC_CONF_OFFSET,
|
||||
offsetof(ngx_http_proxy_loc_conf_t, upstream.no_cache),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("proxy_cache_valid"),
|
||||
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
|
||||
ngx_http_file_cache_valid_set_slot,
|
||||
@ -1917,6 +1924,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
|
||||
#if (NGX_HTTP_CACHE)
|
||||
conf->upstream.cache = NGX_CONF_UNSET_PTR;
|
||||
conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT;
|
||||
conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
|
||||
conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
|
||||
#endif
|
||||
|
||||
@ -2141,6 +2149,9 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||
|NGX_HTTP_UPSTREAM_FT_OFF;
|
||||
}
|
||||
|
||||
ngx_conf_merge_ptr_value(conf->upstream.no_cache,
|
||||
prev->upstream.no_cache, NULL);
|
||||
|
||||
ngx_conf_merge_ptr_value(conf->upstream.cache_valid,
|
||||
prev->upstream.cache_valid, NULL);
|
||||
|
||||
|
@ -134,6 +134,11 @@ char *ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||
char *ngx_http_file_cache_valid_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||
void *conf);
|
||||
|
||||
ngx_int_t ngx_http_cache(ngx_http_request_t *r, ngx_array_t *no_cache);
|
||||
char *ngx_http_no_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||
void *conf);
|
||||
|
||||
|
||||
extern ngx_str_t ngx_http_cache_status[];
|
||||
|
||||
|
||||
|
@ -1692,3 +1692,69 @@ ngx_http_file_cache_valid_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||
|
||||
return NGX_CONF_OK;
|
||||
}
|
||||
|
||||
|
||||
ngx_int_t
|
||||
ngx_http_cache(ngx_http_request_t *r, ngx_array_t *no_cache)
|
||||
{
|
||||
ngx_str_t val;
|
||||
ngx_uint_t i;
|
||||
ngx_http_complex_value_t *cv;
|
||||
|
||||
cv = no_cache->elts;
|
||||
|
||||
for (i = 0; i < no_cache->nelts; i++) {
|
||||
if (ngx_http_complex_value(r, &cv[i], &val) != NGX_OK) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
if (val.len && val.data[0] != '0') {
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
}
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
char *
|
||||
ngx_http_no_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||
{
|
||||
char *p = conf;
|
||||
|
||||
ngx_str_t *value;
|
||||
ngx_uint_t i;
|
||||
ngx_array_t **a;
|
||||
ngx_http_complex_value_t *cv;
|
||||
ngx_http_compile_complex_value_t ccv;
|
||||
|
||||
a = (ngx_array_t **) (p + cmd->offset);
|
||||
|
||||
if (*a == NGX_CONF_UNSET_PTR) {
|
||||
*a = ngx_array_create(cf->pool, 1, sizeof(ngx_http_complex_value_t));
|
||||
if (*a == NULL) {
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
value = cf->args->elts;
|
||||
|
||||
for (i = 1; i < cf->args->nelts; i++) {
|
||||
cv = ngx_array_push(*a);
|
||||
if (cv == NULL) {
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
|
||||
|
||||
ccv.cf = cf;
|
||||
ccv.value = &value[i];
|
||||
ccv.complex_value = cv;
|
||||
|
||||
if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
return NGX_CONF_OK;
|
||||
}
|
||||
|
@ -621,6 +621,13 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
|
||||
|
||||
if (c == NULL) {
|
||||
|
||||
if (u->conf->no_cache) {
|
||||
rc = ngx_http_cache(r, u->conf->no_cache);
|
||||
if (rc != NGX_OK) {
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
|
||||
if (!(r->method & u->conf->cache_methods)) {
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
@ -162,6 +162,7 @@ typedef struct {
|
||||
ngx_uint_t cache_methods;
|
||||
|
||||
ngx_array_t *cache_valid;
|
||||
ngx_array_t *no_cache; /* ngx_http_complex_value_t */
|
||||
#endif
|
||||
|
||||
ngx_array_t *store_lengths;
|
||||
|
Loading…
Reference in New Issue
Block a user