]> git.kaiwu.me - nginx.git/commit
Changed complex value slots to use NGX_CONF_UNSET_PTR.
authorMaxim Dounin <mdounin@mdounin.ru>
Wed, 5 May 2021 23:22:03 +0000 (02:22 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Wed, 5 May 2021 23:22:03 +0000 (02:22 +0300)
commit4faa84085379346fa1cf322907a1f9b6a7fbd583
treeb71229d98bdc04e6224cd9d9a420275f64bee984
parentf02e2a734ef472f0dcf83ab2e8ce96d1acead8a5
Changed complex value slots to use NGX_CONF_UNSET_PTR.

With this change, it is now possible to use ngx_conf_merge_ptr_value()
to merge complex values.  This change 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), and the
change in ngx_conf_set_keyval_slot() (7728:485dba3e2a01, 1.19.4).

To preserve compatibility with existing 3rd party modules, both NULL
and NGX_CONF_UNSET_PTR are accepted for now.
src/http/modules/ngx_http_auth_basic_module.c
src/http/modules/ngx_http_grpc_module.c
src/http/modules/ngx_http_proxy_module.c
src/http/modules/ngx_http_secure_link_module.c
src/http/modules/ngx_http_uwsgi_module.c
src/http/ngx_http_core_module.c
src/http/ngx_http_script.c
src/stream/ngx_stream_proxy_module.c
src/stream/ngx_stream_script.c