From 4faa84085379346fa1cf322907a1f9b6a7fbd583 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Thu, 6 May 2021 02:22:03 +0300 Subject: 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/stream/ngx_stream_script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/stream/ngx_stream_script.c') diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c index a15f772b5..76d347599 100644 --- a/src/stream/ngx_stream_script.c +++ b/src/stream/ngx_stream_script.c @@ -252,7 +252,7 @@ ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, cv = (ngx_stream_complex_value_t **) (p + cmd->offset); - if (*cv != NULL) { + if (*cv != NGX_CONF_UNSET_PTR && *cv != NULL) { return "is duplicate"; } -- cgit