Annotate

.editorconfig @ 12557:ee5b061588ea 0.12

net.unbound: Merge luaunbound and prosody defaults in absence of user config (fixes #1763) (thanks rgd) add_defaults() is supposed to merge 3 tables, the defaults in luaunbound, the defaults from prosody and any config from the prosody config file. In the case where no `unbound={}` has been in the config, it skips over the merge and returns only the prosody built-in defaults. This results in libunbound skipping reading resolv.conf and uses its default behavior of full recursive resolution. Prior to #1737 there were only two tables, the luaunbound defaults and the prosody config, where bypassing the merge and returning the former did the right thing.
author Kim Alvefur <zash@zash.se>
date Sun, 19 Jun 2022 19:49:32 +0200
parent 11706:56feb0cf7052
child 13191:1266efb7101c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11706
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
1 root = true
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
2
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
3 [*]
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
4 end_of_line = lf
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
5 indent_style = tab
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
6 insert_final_newline = true
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
7 trim_trailing_whitespace = true
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
8
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
9 [CHANGES]
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
10 indent_size = 4
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
11 indent_style = space
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
12
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
13 [configure]
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
14 indent_size = 3
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
15 indent_style = space
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
16
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
17 [**.xml]
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
18 indent_size = 2
56feb0cf7052 editorconfig: We use tabs
Kim Alvefur <zash@zash.se>
parents:
diff changeset
19 indent_style = space