Mercurial > hg > nginx
diff src/core/ngx_conf_file.c @ 7728:485dba3e2a01
Core: ngx_conf_set_keyval_slot() now accepts NGX_CONF_UNSET_PTR.
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 22 Oct 2020 18:00:20 +0300 |
parents | d864ee67b5ae |
children | 3108d4d668e4 |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c Tue Oct 13 07:44:09 2020 +0300 +++ b/src/core/ngx_conf_file.c Thu Oct 22 18:00:20 2020 +0300 @@ -1137,7 +1137,7 @@ 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)); if (*a == NULL) { return NGX_CONF_ERROR;