technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed special cases for non-NXT_CONF_VALUE_ARRAY.

Browse Source 
The previous commit added more generic APIs for handling
NXT_CONF_VALUE_ARRAY and non-NXT_CONF_VALUE_ARRAY together.
Modify calling code to remove special cases for arrays and
non-arrays, taking special care that the path for non arrays is
logically equivalent to the previous special cased code.
Use the now-generic array code only.
This commit is contained in:
Alejandro Colomar
2021-12-18 22:58:27 +01:00
parent e525605d05
commit bce0f432c4
5 changed files with 27 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nxt_router.c
View File

@@ -1924,25 +1924,15 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
tls_init->tickets_conf = nxt_conf_get_path(listener,
&conf_tickets);
if (nxt_conf_type(certificate) == NXT_CONF_ARRAY) {
n = nxt_conf_array_elements_count(certificate);
n = nxt_conf_array_elements_count_or_1(certificate);
for (i = 0; i < n; i++) {
value = nxt_conf_get_array_element(certificate, i);
for (i = 0; i < n; i++) {
value = nxt_conf_get_array_element_or_itself(certificate,
i);
nxt_assert(value != NULL);
nxt_assert(value != NULL);
ret = nxt_router_conf_tls_insert(tmcf, value, skcf,
tls_init, i == 0);
if (nxt_slow_path(ret != NXT_OK)) {
goto fail;
}
}
} else {
/* NXT_CONF_STRING */
ret = nxt_router_conf_tls_insert(tmcf, certificate, skcf,
tls_init, 1);
ret = nxt_router_conf_tls_insert(tmcf, value, skcf,
tls_init, i == 0);
if (nxt_slow_path(ret != NXT_OK)) {
goto fail;
}