Merged with the default branch.1.27.0-1

1 files changed, 5 insertions, 1 deletions

diff --git a/src/nxt_conf.h b/src/nxt_conf.h
index 8b3565fd..cfbc5991 100644
--- a/src/nxt_conf.h
+++ b/src/nxt_conf.h
@@ -87,6 +87,8 @@ NXT_EXPORT nxt_conf_value_t *nxt_conf_next_object_member(
     nxt_conf_value_t *value, nxt_str_t *name, uint32_t *next);
 NXT_EXPORT nxt_conf_value_t *nxt_conf_get_array_element(nxt_conf_value_t *value,
     uint32_t index);
+NXT_EXPORT nxt_conf_value_t *nxt_conf_get_array_element_or_itself(
+    nxt_conf_value_t *value, uint32_t index);
 
 NXT_EXPORT nxt_int_t nxt_conf_map_object(nxt_mp_t *mp, nxt_conf_value_t *value,
     nxt_conf_map_t *map, nxt_uint_t n, void *data);
@@ -115,7 +117,7 @@ nxt_int_t nxt_conf_validate(nxt_conf_validation_t *vldt);
 NXT_EXPORT void nxt_conf_get_string(nxt_conf_value_t *value, nxt_str_t *str);
 NXT_EXPORT void nxt_conf_set_string(nxt_conf_value_t *value, nxt_str_t *str);
 NXT_EXPORT nxt_int_t nxt_conf_set_string_dup(nxt_conf_value_t *value,
-    nxt_mp_t *mp, nxt_str_t *str);
+    nxt_mp_t *mp, const nxt_str_t *str);
 NXT_EXPORT double nxt_conf_get_number(nxt_conf_value_t *value);
 NXT_EXPORT uint8_t nxt_conf_get_boolean(nxt_conf_value_t *value);
 
@@ -139,6 +141,8 @@ void nxt_conf_set_element(nxt_conf_value_t *array, nxt_uint_t index,
 nxt_int_t nxt_conf_set_element_string_dup(nxt_conf_value_t *array, nxt_mp_t *mp,
     nxt_uint_t index, nxt_str_t *value);
 NXT_EXPORT nxt_uint_t nxt_conf_array_elements_count(nxt_conf_value_t *value);
+NXT_EXPORT nxt_uint_t nxt_conf_array_elements_count_or_1(
+    nxt_conf_value_t *value);
 void nxt_conf_array_qsort(nxt_conf_value_t *value,
     int (*compare)(const void *, const void *));