IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-26 08:51:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core: ngx_conf_set_keyval_slot() now accepts NGX_CONF_UNSET_PTR.

Browse Source 
With this change, it is now possible to use ngx_conf_merge_ptr_value()
to merge keyval arrays.  This change actually follows much earlier
changes in ngx_conf_merge_ptr_value() and ngx_conf_set_str_array_slot()
in 1452:cd586e963db0 (0.6.10) and 1701:40d004d95d88 (0.6.22).

To preserve compatibility with existing 3rd party modules, both NULL
and NGX_CONF_UNSET_PTR are accepted for now.
This commit is contained in:
Maxim Dounin 2020-10-22 18:00:20 +03:00
parent 2ba670a925
commit af05f05f91
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_conf_file.c
View File

@ -1137,7 +1137,7 @@ ngx_conf_set_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
a = (ngx_array_t **) (p + cmd->offset); a = (ngx_array_t **) (p + cmd->offset);
if (*a == NULL) { if (*a == NGX_CONF_UNSET_PTR || *a == NULL) {
*a = ngx_array_create(cf->pool, 4, sizeof(ngx_keyval_t)); *a = ngx_array_create(cf->pool, 4, sizeof(ngx_keyval_t));
if (*a == NULL) { if (*a == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;

8
src/http/modules/ngx_http_grpc_module.c
View File

@ -4324,7 +4324,6 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
* conf->upstream.hide_headers_hash = { NULL, 0 }; * conf->upstream.hide_headers_hash = { NULL, 0 };
* conf->upstream.ssl_name = NULL; * conf->upstream.ssl_name = NULL;
* *
* conf->headers_source = NULL;
* conf->headers.lengths = NULL; * conf->headers.lengths = NULL;
* conf->headers.values = NULL; * conf->headers.values = NULL;
* conf->headers.hash = { NULL, 0 }; * conf->headers.hash = { NULL, 0 };
@ -4377,6 +4376,8 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf)
conf->upstream.pass_trailers = 1; conf->upstream.pass_trailers = 1;
conf->upstream.preserve_output = 1; conf->upstream.preserve_output = 1;
conf->headers_source = NGX_CONF_UNSET_PTR;
ngx_str_set(&conf->upstream.module, "grpc"); ngx_str_set(&conf->upstream.module, "grpc");
return conf; return conf;
@ -4507,9 +4508,10 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
clcf->handler = ngx_http_grpc_handler; clcf->handler = ngx_http_grpc_handler;
} }
if (conf->headers_source == NULL) { ngx_conf_merge_ptr_value(conf->headers_source, prev->headers_source, NULL);
if (conf->headers_source == prev->headers_source) {
conf->headers = prev->headers; conf->headers = prev->headers;
conf->headers_source = prev->headers_source;
conf->host_set = prev->host_set; conf->host_set = prev->host_set;
} }

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

@ -3268,7 +3268,6 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
* conf->method = NULL; * conf->method = NULL;
* conf->location = NULL; * conf->location = NULL;
* conf->url = { 0, NULL }; * conf->url = { 0, NULL };
* conf->headers_source = NULL;
* conf->headers.lengths = NULL; * conf->headers.lengths = NULL;
* conf->headers.values = NULL; * conf->headers.values = NULL;
* conf->headers.hash = { NULL, 0 }; * conf->headers.hash = { NULL, 0 };
@ -3346,6 +3345,8 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
/* "proxy_cyclic_temp_file" is disabled */ /* "proxy_cyclic_temp_file" is disabled */
conf->upstream.cyclic_temp_file = 0; conf->upstream.cyclic_temp_file = 0;
conf->headers_source = NGX_CONF_UNSET_PTR;
conf->redirect = NGX_CONF_UNSET; conf->redirect = NGX_CONF_UNSET;
conf->upstream.change_buffering = 1; conf->upstream.change_buffering = 1;
@ -3819,12 +3820,13 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
} }
} }
if (conf->headers_source == NULL) { ngx_conf_merge_ptr_value(conf->headers_source, prev->headers_source, NULL);
if (conf->headers_source == prev->headers_source) {
conf->headers = prev->headers; conf->headers = prev->headers;
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
conf->headers_cache = prev->headers_cache; conf->headers_cache = prev->headers_cache;
#endif #endif
conf->headers_source = prev->headers_source;
} }
rc = ngx_http_proxy_init_headers(cf, conf, &conf->headers, rc = ngx_http_proxy_init_headers(cf, conf, &conf->headers,