Upstream: simplified proxy_store and friends configuration code.
This changes internal API related to handling of the "store"
flag in ngx_http_upstream_conf_t. Previously, a non-null value
of "store_lengths" was enough to enable store functionality with
custom path. Now, the "store" flag is also required to be set.
No functional changes.
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 1c63786..b7d07da 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -2436,10 +2436,8 @@
ngx_conf_merge_value(conf->upstream.store,
prev->upstream.store, 0);
- if (conf->upstream.store_lengths == NULL) {
- conf->upstream.store_lengths = prev->upstream.store_lengths;
- conf->upstream.store_values = prev->upstream.store_values;
- }
+ conf->upstream.store_lengths = prev->upstream.store_lengths;
+ conf->upstream.store_values = prev->upstream.store_values;
}
ngx_conf_merge_uint_value(conf->upstream.store_access,
@@ -3206,9 +3204,7 @@
ngx_str_t *value;
ngx_http_script_compile_t sc;
- if (flcf->upstream.store != NGX_CONF_UNSET
- || flcf->upstream.store_lengths)
- {
+ if (flcf->upstream.store != NGX_CONF_UNSET) {
return "is duplicate";
}
@@ -3229,8 +3225,9 @@
#endif
+ flcf->upstream.store = 1;
+
if (ngx_strcmp(value[1].data, "on") == 0) {
- flcf->upstream.store = 1;
return NGX_CONF_OK;
}
@@ -3275,7 +3272,7 @@
return NGX_CONF_OK;
}
- if (flcf->upstream.store > 0 || flcf->upstream.store_lengths) {
+ if (flcf->upstream.store > 0) {
return "is incompatible with \"fastcgi_store\"";
}
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index c3105e2..323d03d 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2628,10 +2628,8 @@
ngx_conf_merge_value(conf->upstream.store,
prev->upstream.store, 0);
- if (conf->upstream.store_lengths == NULL) {
- conf->upstream.store_lengths = prev->upstream.store_lengths;
- conf->upstream.store_values = prev->upstream.store_values;
- }
+ conf->upstream.store_lengths = prev->upstream.store_lengths;
+ conf->upstream.store_values = prev->upstream.store_values;
}
ngx_conf_merge_uint_value(conf->upstream.store_access,
@@ -3794,9 +3792,7 @@
ngx_str_t *value;
ngx_http_script_compile_t sc;
- if (plcf->upstream.store != NGX_CONF_UNSET
- || plcf->upstream.store_lengths)
- {
+ if (plcf->upstream.store != NGX_CONF_UNSET) {
return "is duplicate";
}
@@ -3817,8 +3813,9 @@
#endif
+ plcf->upstream.store = 1;
+
if (ngx_strcmp(value[1].data, "on") == 0) {
- plcf->upstream.store = 1;
return NGX_CONF_OK;
}
@@ -3863,7 +3860,7 @@
return NGX_CONF_OK;
}
- if (plcf->upstream.store > 0 || plcf->upstream.store_lengths) {
+ if (plcf->upstream.store > 0) {
return "is incompatible with \"proxy_store\"";
}
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
index c8cf9aa..8369d56 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -1189,10 +1189,8 @@
if (conf->upstream.store == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0);
- if (conf->upstream.store_lengths == NULL) {
- conf->upstream.store_lengths = prev->upstream.store_lengths;
- conf->upstream.store_values = prev->upstream.store_values;
- }
+ conf->upstream.store_lengths = prev->upstream.store_lengths;
+ conf->upstream.store_values = prev->upstream.store_values;
}
ngx_conf_merge_uint_value(conf->upstream.store_access,
@@ -1760,7 +1758,7 @@
ngx_str_t *value;
ngx_http_script_compile_t sc;
- if (scf->upstream.store != NGX_CONF_UNSET || scf->upstream.store_lengths) {
+ if (scf->upstream.store != NGX_CONF_UNSET) {
return "is duplicate";
}
@@ -1781,8 +1779,9 @@
#endif
+ scf->upstream.store = 1;
+
if (ngx_strcmp(value[1].data, "on") == 0) {
- scf->upstream.store = 1;
return NGX_CONF_OK;
}
@@ -1827,7 +1826,7 @@
return NGX_CONF_OK;
}
- if (scf->upstream.store > 0 || scf->upstream.store_lengths) {
+ if (scf->upstream.store > 0) {
return "is incompatible with \"scgi_store\"";
}
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
index 8e269d7..0243e00 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -1403,10 +1403,8 @@
if (conf->upstream.store == NGX_CONF_UNSET) {
ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0);
- if (conf->upstream.store_lengths == NULL) {
- conf->upstream.store_lengths = prev->upstream.store_lengths;
- conf->upstream.store_values = prev->upstream.store_values;
- }
+ conf->upstream.store_lengths = prev->upstream.store_lengths;
+ conf->upstream.store_values = prev->upstream.store_values;
}
ngx_conf_merge_uint_value(conf->upstream.store_access,
@@ -2047,8 +2045,7 @@
ngx_str_t *value;
ngx_http_script_compile_t sc;
- if (uwcf->upstream.store != NGX_CONF_UNSET || uwcf->upstream.store_lengths)
- {
+ if (uwcf->upstream.store != NGX_CONF_UNSET) {
return "is duplicate";
}
@@ -2069,8 +2066,9 @@
#endif
+ uwcf->upstream.store = 1;
+
if (ngx_strcmp(value[1].data, "on") == 0) {
- uwcf->upstream.store = 1;
return NGX_CONF_OK;
}
@@ -2115,7 +2113,7 @@
return NGX_CONF_OK;
}
- if (uwcf->upstream.store > 0 || uwcf->upstream.store_lengths) {
+ if (uwcf->upstream.store > 0) {
return "is incompatible with \"uwsgi_store\"";
}
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 337ec3e..0693f05 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -540,7 +540,7 @@
#endif
- u->store = (u->conf->store || u->conf->store_lengths);
+ u->store = u->conf->store;
if (!u->store && !r->post_action && !u->conf->ignore_client_abort) {
r->read_event_handler = ngx_http_upstream_rd_check_broken_connection;