From: W.C.A. Wijngaards Date: Thu, 12 Aug 2021 13:05:51 +0000 (+0200) Subject: Changelog note for #519 and example.conf edit X-Git-Tag: release-1.14.0rc1~83 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bee3e77fca77d42e18e3b6e44e4b03027d79c1c;p=thirdparty%2Funbound.git Changelog note for #519 and example.conf edit - Merge #519: Support for selective enabling tcp-upstream for stub/forward zones. - For #519: note stub-tcp-upstream and forward-tcp-upstream in the example configuration file. --- diff --git a/doc/Changelog b/doc/Changelog index 8a420d770..15b0db32c 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -4,6 +4,10 @@ - Add test tool readzone to .gitignore. - Merge #521: Update mini_event.c. - Merge #523: fix: free() call more than once with the same pointer. + - Merge #519: Support for selective enabling tcp-upstream for + stub/forward zones. + - For #519: note stub-tcp-upstream and forward-tcp-upstream in + the example configuration file. 5 August 2021: Wouter - Tag for 1.13.2rc1 release. diff --git a/doc/example.conf.in b/doc/example.conf.in index e13c3ad24..a7287ec5e 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -987,6 +987,7 @@ remote-control: # stub-addr: 192.0.2.68 # stub-prime: no # stub-first: no +# stub-tcp-upstream: no # stub-tls-upstream: no # stub-no-cache: no # stub-zone: @@ -1004,6 +1005,7 @@ remote-control: # forward-addr: 192.0.2.68 # forward-addr: 192.0.2.73@5355 # forward to port 5355. # forward-first: no +# forward-tcp-upstream: no # forward-tls-upstream: no # forward-no-cache: no # forward-zone: