]> git.kaiwu.me - nginx.git/commit
projects / nginx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ba670a) | patch
Core: ngx_conf_set_keyval_slot() now accepts NGX_CONF_UNSET_PTR.
authorMaxim Dounin <mdounin@mdounin.ru>
Thu, 22 Oct 2020 15:00:20 +0000 (18:00 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Thu, 22 Oct 2020 15:00:20 +0000 (18:00 +0300)
commitaf05f05f91ef0295d875871d4ab3c1a1226ad108
tree4eddc3c068884476d474fb29f3a76ec560ec1e1etree | snapshot
parent2ba670a9257da1872b2dd7a866651b637a29997dcommit | diff
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.
src/core/ngx_conf_file.c diff | blob | history
src/http/modules/ngx_http_grpc_module.c diff | blob | history
src/http/modules/ngx_http_proxy_module.c diff | blob | history
nginx upstream