Annotate

.hgignore @ 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 8345:850c433eb862
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1296
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1 syntax: glob
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 .hgignore
7770
f0024972489e hgignore: Ignore luacheck cache file
Kim Alvefur <zash@zash.se>
parents: 3636
diff changeset
3 .luacheckcache
1296
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 data
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5 local
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 www_files
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7 html/*
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
8 prosody.lua
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9 prosody.cfg.lua
2905
b924d915c4d0 .hgignore: Ignore prosody.version (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents: 1296
diff changeset
10 prosody.version
1296
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 config.unix
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12 *.patch
3636
88e4397e39a9 .hgignore: Ignore *.diff.
Waqas Hussain <waqas20@gmail.com>
parents: 3635
diff changeset
13 *.diff
1296
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14 *.orig
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15 *.rej
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16 *.save
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 *~
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
18 *.o
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
19 *.so
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
20 *.install
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
21 *.pid
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
22 *.log
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
23 *.err
5cf4c444d3f9 Adding .hgignore
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
24 *.debug
3635
72f3619eeabd .hgignore: Ignore Windows compilation artifacts.
Waqas Hussain <waqas20@gmail.com>
parents: 2905
diff changeset
25 *.dll
72f3619eeabd .hgignore: Ignore Windows compilation artifacts.
Waqas Hussain <waqas20@gmail.com>
parents: 2905
diff changeset
26 *.exp
72f3619eeabd .hgignore: Ignore Windows compilation artifacts.
Waqas Hussain <waqas20@gmail.com>
parents: 2905
diff changeset
27 *.lib
72f3619eeabd .hgignore: Ignore Windows compilation artifacts.
Waqas Hussain <waqas20@gmail.com>
parents: 2905
diff changeset
28 *.obj
8244
6a27e5f276f7 .hgignore: Add luacov.report.out, luacov.report.out.index and luacov.stats.out
Waqas Hussain <waqas20@gmail.com>
parents: 7770
diff changeset
29 luacov.report.out
6a27e5f276f7 .hgignore: Add luacov.report.out, luacov.report.out.index and luacov.stats.out
Waqas Hussain <waqas20@gmail.com>
parents: 7770
diff changeset
30 luacov.report.out.index
6a27e5f276f7 .hgignore: Add luacov.report.out, luacov.report.out.index and luacov.stats.out
Waqas Hussain <waqas20@gmail.com>
parents: 7770
diff changeset
31 luacov.stats.out