From: Philip Homburg <philip@nlnetlabs.nl>
Date: Tue, 21 Jun 2022 13:32:35 +0000 (+0200)
Subject: Merge branch 'zone-parsers-blank-line-issue'
X-Git-Tag: release-1.16.1rc1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c806b5a2dfe599535451b61ef0333220796361d3;p=thirdparty%2Funbound.git

Merge branch 'zone-parsers-blank-line-issue'
---

c806b5a2dfe599535451b61ef0333220796361d3
diff --cc doc/Changelog
index 73ed03dfc,dbad55c3f..f02d159d8
--- a/doc/Changelog
+++ b/doc/Changelog
@@@ -1,11 -1,7 +1,15 @@@
+ 21 June 2022: Philip
+ 	- Fix for loading locally stored zones that have lines with blanks or
+ 	  blanks and comments.
+ 
 +20 June 2022: George
 +	- Remove unused LDNS function check for GOST Engine unloading.
 +
 +14 June 2022: George
 +	- Merge PR #688: Rpz url notify issue.
 +	- Note in the unbound.conf text that NOTIFY is allowed from the url:
 +	  addresses for auth and rpz zones.
 +
  3 June 2022: George
  	- Fix for edns client subnet to respect not looking in its cache when
  	  instructed to do so (e.g., prefetch).