mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-01 11:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: added variables support to proxy_cache and friends.

Browse Source
This commit is contained in:
Valentin Bartenev 2014-12-22 12:59:09 +03:00
parent b24ad42008
commit 7817df480e
7 changed files with 352 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/http/modules/ngx_http_fastcgi_module.c
View File

@ -10,6 +10,11 @@
#include <ngx_http.h>
typedef struct {
ngx_array_t caches; /* ngx_http_file_cache_t * */
} ngx_http_fastcgi_main_conf_t;
typedef struct {
ngx_array_t *flushes;
ngx_array_t *lengths;
@ -155,6 +160,7 @@ static void ngx_http_fastcgi_finalize_request(ngx_http_request_t *r,
ngx_int_t rc);
static ngx_int_t ngx_http_fastcgi_add_variables(ngx_conf_t *cf);
static void *ngx_http_fastcgi_create_main_conf(ngx_conf_t *cf);
static void *ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf);
static char *ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf,
void *parent, void *child);
@ -368,8 +374,8 @@ static ngx_command_t ngx_http_fastcgi_commands[] = {
{ ngx_string("fastcgi_cache_path"),
NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE,
ngx_http_file_cache_set_slot,
0,
0,
NGX_HTTP_MAIN_CONF_OFFSET,
offsetof(ngx_http_fastcgi_main_conf_t, caches),
&ngx_http_fastcgi_module },
{ ngx_string("fastcgi_cache_bypass"),
@ -536,7 +542,7 @@ static ngx_http_module_t ngx_http_fastcgi_module_ctx = {
ngx_http_fastcgi_add_variables, /* preconfiguration */
NULL, /* postconfiguration */
NULL, /* create main configuration */
ngx_http_fastcgi_create_main_conf, /* create main configuration */
NULL, /* init main configuration */
NULL, /* create server configuration */
@ -635,10 +641,13 @@ static ngx_path_init_t ngx_http_fastcgi_temp_path = {
static ngx_int_t
ngx_http_fastcgi_handler(ngx_http_request_t *r)
{
ngx_int_t rc;
ngx_http_upstream_t *u;
ngx_http_fastcgi_ctx_t *f;
ngx_http_fastcgi_loc_conf_t *flcf;
ngx_int_t rc;
ngx_http_upstream_t *u;
ngx_http_fastcgi_ctx_t *f;
ngx_http_fastcgi_loc_conf_t *flcf;
#if (NGX_HTTP_CACHE)
ngx_http_fastcgi_main_conf_t *fmcf;
#endif
if (ngx_http_upstream_create(r) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
@ -667,8 +676,12 @@ ngx_http_fastcgi_handler(ngx_http_request_t *r)
u->conf = &flcf->upstream;
#if (NGX_HTTP_CACHE)
fmcf = ngx_http_get_module_main_conf(r, ngx_http_fastcgi_module);
u->caches = &fmcf->caches;
u->create_key = ngx_http_fastcgi_create_key;
#endif
u->create_request = ngx_http_fastcgi_create_request;
u->reinit_request = ngx_http_fastcgi_reinit_request;
u->process_header = ngx_http_fastcgi_process_header;
@ -2336,6 +2349,29 @@ ngx_http_fastcgi_add_variables(ngx_conf_t *cf)
}
static void *
ngx_http_fastcgi_create_main_conf(ngx_conf_t *cf)
{
ngx_http_fastcgi_main_conf_t *conf;
conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fastcgi_main_conf_t));
if (conf == NULL) {
return NULL;
}
#if (NGX_HTTP_CACHE)
if (ngx_array_init(&conf->caches, cf->pool, 4,
sizeof(ngx_http_file_cache_t *))
!= NGX_OK)
{
return NULL;
}
#endif
return conf;
}
static void *
ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
{
@ -2617,6 +2653,7 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
prev->upstream.cache, 0);
conf->upstream.cache_zone = prev->upstream.cache_zone;
conf->upstream.cache_value = prev->upstream.cache_value;
}
if (conf->upstream.cache_zone && conf->upstream.cache_zone->data == NULL) {
@ -3272,7 +3309,9 @@ ngx_http_fastcgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_http_fastcgi_loc_conf_t *flcf = conf;
ngx_str_t *value;
ngx_str_t *value;
ngx_http_complex_value_t cv;
ngx_http_compile_complex_value_t ccv;
value = cf->args->elts;
@ -3291,6 +3330,29 @@ ngx_http_fastcgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
flcf->upstream.cache = 1;
ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
ccv.cf = cf;
ccv.value = &value[1];
ccv.complex_value = &cv;
if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
return NGX_CONF_ERROR;
}
if (cv.lengths != NULL) {
flcf->upstream.cache_value = ngx_palloc(cf->pool,
sizeof(ngx_http_complex_value_t));
if (flcf->upstream.cache_value == NULL) {
return NGX_CONF_ERROR;
}
*flcf->upstream.cache_value = cv;
return NGX_CONF_OK;
}
flcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
&ngx_http_fastcgi_module);
if (flcf->upstream.cache_zone == NULL) {

78
src/http/modules/ngx_http_proxy_module.c
View File

@ -10,6 +10,11 @@
#include <ngx_http.h>
typedef struct {
ngx_array_t caches; /* ngx_http_file_cache_t * */
} ngx_http_proxy_main_conf_t;
typedef struct ngx_http_proxy_rewrite_s ngx_http_proxy_rewrite_t;
typedef ngx_int_t (*ngx_http_proxy_rewrite_pt)(ngx_http_request_t *r,
@ -151,6 +156,7 @@ static ngx_int_t ngx_http_proxy_rewrite(ngx_http_request_t *r,
ngx_table_elt_t *h, size_t prefix, size_t len, ngx_str_t *replacement);
static ngx_int_t ngx_http_proxy_add_variables(ngx_conf_t *cf);
static void *ngx_http_proxy_create_main_conf(ngx_conf_t *cf);
static void *ngx_http_proxy_create_loc_conf(ngx_conf_t *cf);
static char *ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf,
void *parent, void *child);
@ -438,8 +444,8 @@ static ngx_command_t ngx_http_proxy_commands[] = {
{ ngx_string("proxy_cache_path"),
NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE,
ngx_http_file_cache_set_slot,
0,
0,
NGX_HTTP_MAIN_CONF_OFFSET,
offsetof(ngx_http_proxy_main_conf_t, caches),
&ngx_http_proxy_module },
{ ngx_string("proxy_cache_bypass"),
@ -680,7 +686,7 @@ static ngx_http_module_t ngx_http_proxy_module_ctx = {
ngx_http_proxy_add_variables, /* preconfiguration */
NULL, /* postconfiguration */
NULL, /* create main configuration */
ngx_http_proxy_create_main_conf, /* create main configuration */
NULL, /* init main configuration */
NULL, /* create server configuration */
@ -792,10 +798,13 @@ static ngx_path_init_t ngx_http_proxy_temp_path = {
static ngx_int_t
ngx_http_proxy_handler(ngx_http_request_t *r)
{
ngx_int_t rc;
ngx_http_upstream_t *u;
ngx_http_proxy_ctx_t *ctx;
ngx_http_proxy_loc_conf_t *plcf;
ngx_int_t rc;
ngx_http_upstream_t *u;
ngx_http_proxy_ctx_t *ctx;
ngx_http_proxy_loc_conf_t *plcf;
#if (NGX_HTTP_CACHE)
ngx_http_proxy_main_conf_t *pmcf;
#endif
if (ngx_http_upstream_create(r) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
@ -830,8 +839,12 @@ ngx_http_proxy_handler(ngx_http_request_t *r)
u->conf = &plcf->upstream;
#if (NGX_HTTP_CACHE)
pmcf = ngx_http_get_module_main_conf(r, ngx_http_proxy_module);
u->caches = &pmcf->caches;
u->create_key = ngx_http_proxy_create_key;
#endif
u->create_request = ngx_http_proxy_create_request;
u->reinit_request = ngx_http_proxy_reinit_request;
u->process_header = ngx_http_proxy_process_status_line;
@ -2493,6 +2506,29 @@ ngx_http_proxy_add_variables(ngx_conf_t *cf)
}
static void *
ngx_http_proxy_create_main_conf(ngx_conf_t *cf)
{
ngx_http_proxy_main_conf_t *conf;
conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_proxy_main_conf_t));
if (conf == NULL) {
return NULL;
}
#if (NGX_HTTP_CACHE)
if (ngx_array_init(&conf->caches, cf->pool, 4,
sizeof(ngx_http_file_cache_t *))
!= NGX_OK)
{
return NULL;
}
#endif
return conf;
}
static void *
ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
{
@ -2808,6 +2844,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
prev->upstream.cache, 0);
conf->upstream.cache_zone = prev->upstream.cache_zone;
conf->upstream.cache_value = prev->upstream.cache_value;
}
if (conf->upstream.cache_zone && conf->upstream.cache_zone->data == NULL) {
@ -3860,7 +3897,9 @@ ngx_http_proxy_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_http_proxy_loc_conf_t *plcf = conf;
ngx_str_t *value;
ngx_str_t *value;
ngx_http_complex_value_t cv;
ngx_http_compile_complex_value_t ccv;
value = cf->args->elts;
@ -3879,6 +3918,29 @@ ngx_http_proxy_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
plcf->upstream.cache = 1;
ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
ccv.cf = cf;
ccv.value = &value[1];
ccv.complex_value = &cv;
if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
return NGX_CONF_ERROR;
}
if (cv.lengths != NULL) {
plcf->upstream.cache_value = ngx_palloc(cf->pool,
sizeof(ngx_http_complex_value_t));
if (plcf->upstream.cache_value == NULL) {
return NGX_CONF_ERROR;
}
*plcf->upstream.cache_value = cv;
return NGX_CONF_OK;
}
plcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
&ngx_http_proxy_module);
if (plcf->upstream.cache_zone == NULL) {

78
src/http/modules/ngx_http_scgi_module.c
View File

@ -11,6 +11,11 @@
#include <ngx_http.h>
typedef struct {
ngx_array_t caches; /* ngx_http_file_cache_t * */
} ngx_http_scgi_main_conf_t;
typedef struct {
ngx_array_t *flushes;
ngx_array_t *lengths;
@ -47,6 +52,7 @@ static ngx_int_t ngx_http_scgi_process_header(ngx_http_request_t *r);
static void ngx_http_scgi_abort_request(ngx_http_request_t *r);
static void ngx_http_scgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc);
static void *ngx_http_scgi_create_main_conf(ngx_conf_t *cf);
static void *ngx_http_scgi_create_loc_conf(ngx_conf_t *cf);
static char *ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent,
void *child);
@ -224,8 +230,8 @@ static ngx_command_t ngx_http_scgi_commands[] = {
{ ngx_string("scgi_cache_path"),
NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE,
ngx_http_file_cache_set_slot,
0,
0,
NGX_HTTP_MAIN_CONF_OFFSET,
offsetof(ngx_http_scgi_main_conf_t, caches),
&ngx_http_scgi_module },
{ ngx_string("scgi_cache_bypass"),
@ -378,7 +384,7 @@ static ngx_http_module_t ngx_http_scgi_module_ctx = {
NULL, /* preconfiguration */
NULL, /* postconfiguration */
NULL, /* create main configuration */
ngx_http_scgi_create_main_conf, /* create main configuration */
NULL, /* init main configuration */
NULL, /* create server configuration */
@ -440,10 +446,13 @@ static ngx_path_init_t ngx_http_scgi_temp_path = {
static ngx_int_t
ngx_http_scgi_handler(ngx_http_request_t *r)
{
ngx_int_t rc;
ngx_http_status_t *status;
ngx_http_upstream_t *u;
ngx_http_scgi_loc_conf_t *scf;
ngx_int_t rc;
ngx_http_status_t *status;
ngx_http_upstream_t *u;
ngx_http_scgi_loc_conf_t *scf;
#if (NGX_HTTP_CACHE)
ngx_http_scgi_main_conf_t *smcf;
#endif
if (ngx_http_upstream_create(r) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
@ -472,8 +481,12 @@ ngx_http_scgi_handler(ngx_http_request_t *r)
u->conf = &scf->upstream;
#if (NGX_HTTP_CACHE)
smcf = ngx_http_get_module_main_conf(r, ngx_http_scgi_module);
u->caches = &smcf->caches;
u->create_key = ngx_http_scgi_create_key;
#endif
u->create_request = ngx_http_scgi_create_request;
u->reinit_request = ngx_http_scgi_reinit_request;
u->process_header = ngx_http_scgi_process_status_line;
@ -1112,6 +1125,29 @@ ngx_http_scgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
}
static void *
ngx_http_scgi_create_main_conf(ngx_conf_t *cf)
{
ngx_http_scgi_main_conf_t *conf;
conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_scgi_main_conf_t));
if (conf == NULL) {
return NULL;
}
#if (NGX_HTTP_CACHE)
if (ngx_array_init(&conf->caches, cf->pool, 4,
sizeof(ngx_http_file_cache_t *))
!= NGX_OK)
{
return NULL;
}
#endif
return conf;
}
static void *
ngx_http_scgi_create_loc_conf(ngx_conf_t *cf)
{
@ -1369,6 +1405,7 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
prev->upstream.cache, 0);
conf->upstream.cache_zone = prev->upstream.cache_zone;
conf->upstream.cache_value = prev->upstream.cache_value;
}
if (conf->upstream.cache_zone && conf->upstream.cache_zone->data == NULL) {
@ -1825,7 +1862,9 @@ ngx_http_scgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_http_scgi_loc_conf_t *scf = conf;
ngx_str_t *value;
ngx_str_t *value;
ngx_http_complex_value_t cv;
ngx_http_compile_complex_value_t ccv;
value = cf->args->elts;
@ -1844,6 +1883,29 @@ ngx_http_scgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
scf->upstream.cache = 1;
ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
ccv.cf = cf;
ccv.value = &value[1];
ccv.complex_value = &cv;
if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
return NGX_CONF_ERROR;
}
if (cv.lengths != NULL) {
scf->upstream.cache_value = ngx_palloc(cf->pool,
sizeof(ngx_http_complex_value_t));
if (scf->upstream.cache_value == NULL) {
return NGX_CONF_ERROR;
}
*scf->upstream.cache_value = cv;
return NGX_CONF_OK;
}
scf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
&ngx_http_scgi_module);
if (scf->upstream.cache_zone == NULL) {

78
src/http/modules/ngx_http_uwsgi_module.c
View File

@ -12,6 +12,11 @@
#include <ngx_http.h>
typedef struct {
ngx_array_t caches; /* ngx_http_file_cache_t * */
} ngx_http_uwsgi_main_conf_t;
typedef struct {
ngx_array_t *flushes;
ngx_array_t *lengths;
@ -66,6 +71,7 @@ static void ngx_http_uwsgi_abort_request(ngx_http_request_t *r);
static void ngx_http_uwsgi_finalize_request(ngx_http_request_t *r,
ngx_int_t rc);
static void *ngx_http_uwsgi_create_main_conf(ngx_conf_t *cf);
static void *ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf);
static char *ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent,
void *child);
@ -284,8 +290,8 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
{ ngx_string("uwsgi_cache_path"),
NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE,
ngx_http_file_cache_set_slot,
0,
0,
NGX_HTTP_MAIN_CONF_OFFSET,
offsetof(ngx_http_uwsgi_main_conf_t, caches),
&ngx_http_uwsgi_module },
{ ngx_string("uwsgi_cache_bypass"),
@ -533,7 +539,7 @@ static ngx_http_module_t ngx_http_uwsgi_module_ctx = {
NULL, /* preconfiguration */
NULL, /* postconfiguration */
NULL, /* create main configuration */
ngx_http_uwsgi_create_main_conf, /* create main configuration */
NULL, /* init main configuration */
NULL, /* create server configuration */
@ -594,10 +600,13 @@ static ngx_path_init_t ngx_http_uwsgi_temp_path = {
static ngx_int_t
ngx_http_uwsgi_handler(ngx_http_request_t *r)
{
ngx_int_t rc;
ngx_http_status_t *status;
ngx_http_upstream_t *u;
ngx_http_uwsgi_loc_conf_t *uwcf;
ngx_int_t rc;
ngx_http_status_t *status;
ngx_http_upstream_t *u;
ngx_http_uwsgi_loc_conf_t *uwcf;
#if (NGX_HTTP_CACHE)
ngx_http_uwsgi_main_conf_t *uwmcf;
#endif
if (ngx_http_upstream_create(r) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
@ -640,8 +649,12 @@ ngx_http_uwsgi_handler(ngx_http_request_t *r)
u->conf = &uwcf->upstream;
#if (NGX_HTTP_CACHE)
uwmcf = ngx_http_get_module_main_conf(r, ngx_http_uwsgi_module);
u->caches = &uwmcf->caches;
u->create_key = ngx_http_uwsgi_create_key;
#endif
u->create_request = ngx_http_uwsgi_create_request;
u->reinit_request = ngx_http_uwsgi_reinit_request;
u->process_header = ngx_http_uwsgi_process_status_line;
@ -1315,6 +1328,29 @@ ngx_http_uwsgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
}
static void *
ngx_http_uwsgi_create_main_conf(ngx_conf_t *cf)
{
ngx_http_uwsgi_main_conf_t *conf;
conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_uwsgi_main_conf_t));
if (conf == NULL) {
return NULL;
}
#if (NGX_HTTP_CACHE)
if (ngx_array_init(&conf->caches, cf->pool, 4,
sizeof(ngx_http_file_cache_t *))
!= NGX_OK)
{
return NULL;
}
#endif
return conf;
}
static void *
ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
{
@ -1583,6 +1619,7 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
prev->upstream.cache, 0);
conf->upstream.cache_zone = prev->upstream.cache_zone;
conf->upstream.cache_value = prev->upstream.cache_value;
}
if (conf->upstream.cache_zone && conf->upstream.cache_zone->data == NULL) {
@ -2114,7 +2151,9 @@ ngx_http_uwsgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_http_uwsgi_loc_conf_t *uwcf = conf;
ngx_str_t *value;
ngx_str_t *value;
ngx_http_complex_value_t cv;
ngx_http_compile_complex_value_t ccv;
value = cf->args->elts;
@ -2133,6 +2172,29 @@ ngx_http_uwsgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
uwcf->upstream.cache = 1;
ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
ccv.cf = cf;
ccv.value = &value[1];
ccv.complex_value = &cv;
if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
return NGX_CONF_ERROR;
}
if (cv.lengths != NULL) {
uwcf->upstream.cache_value = ngx_palloc(cf->pool,
sizeof(ngx_http_complex_value_t));
if (uwcf->upstream.cache_value == NULL) {
return NGX_CONF_ERROR;
}
*uwcf->upstream.cache_value = cv;
return NGX_CONF_OK;
}
uwcf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0,
&ngx_http_uwsgi_module);
if (uwcf->upstream.cache_zone == NULL) {

14
src/http/ngx_http_file_cache.c
View File

@ -2032,6 +2032,8 @@ ngx_http_file_cache_valid(ngx_array_t *cache_valid, ngx_uint_t status)
char *
ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
char *confp = conf;
off_t max_size;
u_char *last, *p;
time_t inactive;
@ -2040,7 +2042,8 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_int_t loader_files;
ngx_msec_t loader_sleep, loader_threshold;
ngx_uint_t i, n;
ngx_http_file_cache_t *cache;
ngx_array_t *caches;
ngx_http_file_cache_t *cache, **ce;
cache = ngx_pcalloc(cf->pool, sizeof(ngx_http_file_cache_t));
if (cache == NULL) {
@ -2252,6 +2255,15 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
cache->inactive = inactive;
cache->max_size = max_size;
caches = (ngx_array_t *) (confp + cmd->offset);
ce = ngx_array_push(caches);
if (ce == NULL) {
return NGX_CONF_ERROR;
}
*ce = cache;
return NGX_CONF_OK;
}

58
src/http/ngx_http_upstream.c
View File

@ -13,6 +13,8 @@
#if (NGX_HTTP_CACHE)
static ngx_int_t ngx_http_upstream_cache(ngx_http_request_t *r,
ngx_http_upstream_t *u);
static ngx_int_t ngx_http_upstream_cache_get(ngx_http_request_t *r,
ngx_http_upstream_t *u, ngx_http_file_cache_t **cache);
static ngx_int_t ngx_http_upstream_cache_send(ngx_http_request_t *r,
ngx_http_upstream_t *u);
static ngx_int_t ngx_http_upstream_cache_status(ngx_http_request_t *r,
@ -723,8 +725,9 @@ found:
static ngx_int_t
ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
{
ngx_int_t rc;
ngx_http_cache_t *c;
ngx_int_t rc;
ngx_http_cache_t *c;
ngx_http_file_cache_t *cache;
c = r->cache;
@ -734,6 +737,12 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
return NGX_DECLINED;
}
rc = ngx_http_upstream_cache_get(r, u, &cache);
if (rc != NGX_OK) {
return rc;
}
if (r->method & NGX_HTTP_HEAD) {
u->method = ngx_http_core_get_method;
}
@ -767,7 +776,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
c->body_start = u->conf->buffer_size;
c->min_uses = u->conf->cache_min_uses;
c->file_cache = u->conf->cache_zone->data;
c->file_cache = cache;
switch (ngx_http_test_predicates(r, u->conf->cache_bypass)) {
@ -873,6 +882,49 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
}
static ngx_int_t
ngx_http_upstream_cache_get(ngx_http_request_t *r, ngx_http_upstream_t *u,
ngx_http_file_cache_t **cache)
{
ngx_str_t *name, val;
ngx_uint_t i;
ngx_http_file_cache_t **caches;
if (u->conf->cache_zone) {
*cache = u->conf->cache_zone->data;
return NGX_OK;
}
if (ngx_http_complex_value(r, u->conf->cache_value, &val) != NGX_OK) {
return NGX_ERROR;
}
if (val.len == 0
|| (val.len == 3 && ngx_strncmp(val.data, "off", 3) == 0))
{
return NGX_DECLINED;
}
caches = u->caches->elts;
for (i = 0; i < u->caches->nelts; i++) {
name = &caches[i]->shm_zone->shm.name;
if (name->len == val.len
&& ngx_strncmp(name->data, val.data, val.len) == 0)
{
*cache = caches[i];
return NGX_OK;
}
}
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"cache \"%V\" not found", &val);
return NGX_ERROR;
}
static ngx_int_t
ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u)
{

4
src/http/ngx_http_upstream.h
View File

@ -176,6 +176,7 @@ typedef struct {
#if (NGX_HTTP_CACHE)
ngx_shm_zone_t *cache_zone;
ngx_http_complex_value_t *cache_value;
ngx_uint_t cache_min_uses;
ngx_uint_t cache_use_stale;
@ -300,6 +301,9 @@ struct ngx_http_upstream_s {
ngx_chain_writer_ctx_t writer;
ngx_http_upstream_conf_t *conf;
#if (NGX_HTTP_CACHE)
ngx_array_t *caches;
#endif
ngx_http_upstream_headers_in_t headers_in;