Software /
code /
prosody
Annotate
.busted @ 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 | 9964:f299d4917dd8 |
rev | line source |
---|---|
9374
a1a39d395260
mod_bosh: Add tests (run with 'busted -r bosh')
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
1 return { |
a1a39d395260
mod_bosh: Add tests (run with 'busted -r bosh')
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
2 _all = { |
a1a39d395260
mod_bosh: Add tests (run with 'busted -r bosh')
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
3 }, |
a1a39d395260
mod_bosh: Add tests (run with 'busted -r bosh')
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
4 default = { |
9964
f299d4917dd8
util.hashes: Add test vectors from RFC 6070 for PBKDF2 (aka SCRAM Hi())
Kim Alvefur <zash@zash.se>
parents:
9452
diff
changeset
|
5 ["exclude-tags"] = "mod_bosh,storage,SLOW"; |
9452
9d892b2415bf
Fix storage tests so they run, but not by default
Matthew Wild <mwild1@gmail.com>
parents:
9374
diff
changeset
|
6 }; |
9374
a1a39d395260
mod_bosh: Add tests (run with 'busted -r bosh')
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 bosh = { |
a1a39d395260
mod_bosh: Add tests (run with 'busted -r bosh')
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
8 tags = "mod_bosh"; |
9452
9d892b2415bf
Fix storage tests so they run, but not by default
Matthew Wild <mwild1@gmail.com>
parents:
9374
diff
changeset
|
9 }; |
9d892b2415bf
Fix storage tests so they run, but not by default
Matthew Wild <mwild1@gmail.com>
parents:
9374
diff
changeset
|
10 storage = { |
9d892b2415bf
Fix storage tests so they run, but not by default
Matthew Wild <mwild1@gmail.com>
parents:
9374
diff
changeset
|
11 tags = "storage"; |
9d892b2415bf
Fix storage tests so they run, but not by default
Matthew Wild <mwild1@gmail.com>
parents:
9374
diff
changeset
|
12 }; |
9374
a1a39d395260
mod_bosh: Add tests (run with 'busted -r bosh')
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 } |