aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/ngx_http_fastcgi_module.c15
-rw-r--r--src/http/modules/ngx_http_proxy_module.c15
-rw-r--r--src/http/modules/ngx_http_scgi_module.c13
-rw-r--r--src/http/modules/ngx_http_uwsgi_module.c14
-rw-r--r--src/http/ngx_http_upstream.c2
5 files changed, 25 insertions, 34 deletions
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 1c63786c8..b7d07daad 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -2436,10 +2436,8 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
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_http_fastcgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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 @@ ngx_http_fastcgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
#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 @@ ngx_http_fastcgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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 c3105e299..323d03d84 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2628,10 +2628,8 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
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_http_proxy_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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 @@ ngx_http_proxy_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
#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 @@ ngx_http_proxy_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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 c8cf9aaa8..8369d5683 100644
--- a/src/http/modules/ngx_http_scgi_module.c
+++ b/src/http/modules/ngx_http_scgi_module.c
@@ -1189,10 +1189,8 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
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_http_scgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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 @@ ngx_http_scgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
#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 @@ ngx_http_scgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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 8e269d7e9..0243e0037 100644
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -1403,10 +1403,8 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
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_http_uwsgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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 @@ ngx_http_uwsgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
#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 @@ ngx_http_uwsgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
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 337ec3eb8..0693f0529 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -540,7 +540,7 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
#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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 04:11:52 +0000