details: http://hg.nginx.org/nginx/rev/610832763648
branches:
changeset: 5951:610832763648
user: Valentin Bartenev <vb...@nginx.com>
date: Mon Dec 22 12:59:09 2014 +0300
description:
Upstream: added variables support to proxy_cache and friends.
diffstat:
src/http/modules/ngx_http_fastcgi_module.c | 78 ++++++++++++++++++++++++++---
src/http/modules/ngx_http_proxy_module.c | 78 ++++++++++++++++++++++++++---
src/http/modules/ngx_http_scgi_module.c | 78 ++++++++++++++++++++++++++---
src/http/modules/ngx_http_uwsgi_module.c | 78 ++++++++++++++++++++++++++---
src/http/ngx_http_file_cache.c | 14 +++++-
src/http/ngx_http_upstream.c | 58 +++++++++++++++++++++-
src/http/ngx_http_upstream.h | 4 +
7 files changed, 352 insertions(+), 36 deletions(-)
diffs (truncated from 767 to 300 lines):
diff -r eaeecf00d5d7 -r 610832763648 src/http/modules/ngx_http_fastcgi_module.c
--- a/src/http/modules/ngx_http_fastcgi_module.c Mon Dec 22 12:59:06
2014 +0300
+++ b/src/http/modules/ngx_http_fastcgi_module.c Mon Dec 22 12:59:09
2014 +0300
@@ -11,6 +11,11 @@
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;
ngx_array_t *values;
@@ -155,6 +160,7 @@ static void ngx_http_fastcgi_finalize_re
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_c
{ 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_fastc
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
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_reques
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;
@@ -2337,6 +2350,29 @@ ngx_http_fastcgi_add_variables(ngx_conf_
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)
{
ngx_http_fastcgi_loc_conf_t *conf;
@@ -2617,6 +2653,7 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf
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, n
{
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, n
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) {
diff -r eaeecf00d5d7 -r 610832763648 src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c Mon Dec 22 12:59:06 2014 +0300
+++ b/src/http/modules/ngx_http_proxy_module.c Mon Dec 22 12:59:09 2014 +0300
@@ -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_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_com
{ 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
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_t
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_
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;
@@ -2494,6 +2507,29 @@ ngx_http_proxy_add_variables(ngx_conf_t
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)
{
ngx_http_proxy_loc_conf_t *conf;
@@ -2808,6 +2844,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t
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
{
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
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;
+
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
