- Change default value for 'rrset-roundrobin' to yes.

diff --git a/doc/Changelog b/doc/Changelog
index 0fa60aec02cd5be3605414e89ba94f981edc7ad9..07535b9e2ed0e7825f5c7a9603b22d72bac7a9bf 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+21 April 2020: George
+       - Change default value for 'rrset-roundrobin' to yes.
+
 20 April 2020: Wouter
        - Fix #222: --enable-rpath, fails to rpath python lib.
        - Fix for count of reply states in the mesh.

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 3871e6ff0bae6df72063966808dd9a3f52c420ba..a1a687422350e5674e9c21b021de2ee60ef40026 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -473,7 +473,7 @@ server:
        # deny-any: no
 
        # if yes, Unbound rotates RRSet order in response.
-       # rrset-roundrobin: no
+       # rrset-roundrobin: yes
 
        # if yes, Unbound doesn't insert authority/additional sections
        # into response messages when those sections are not required.

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index d76655195bcf623c683f0030d6a7ef91bd851d67..37692db5e6571a05347435fe70804f5c68919bb5 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -932,7 +932,7 @@ are none.
 .TP
 .B rrset\-roundrobin: \fI<yes or no>
 If yes, Unbound rotates RRSet order in response (the random number is taken
-from the query ID, for speed and thread safety).  Default is no.
+from the query ID, for speed and thread safety).  Default is yes.
 .TP
 .B minimal-responses: \fI<yes or no>
 If yes, Unbound doesn't insert authority/additional sections into response

diff --git a/util/config_file.c b/util/config_file.c
index 91a2c19d7ed0446fb4fee3440ca655f324fa844f..2a809f87525316125da81b7e220a1f31f6b74ee0 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -274,7 +274,7 @@ config_create(void)
        cfg->control_port = UNBOUND_CONTROL_PORT;
        cfg->control_use_cert = 1;
        cfg->minimal_responses = 1;
-       cfg->rrset_roundrobin = 0;
+       cfg->rrset_roundrobin = 1;
        cfg->unknown_server_time_limit = 376;
        cfg->max_udp_size = 4096;
        if(!(cfg->server_key_file = strdup(RUN_DIR"/unbound_server.key"))) 

diff --git a/util/net_help.c b/util/net_help.c
index 26e0c89ee57aaa3f5f03467bad796cf04a467e83..e287f90aab4a0e3d271c381b8689ca2cbed1d6fc 100644 (file)
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -67,8 +67,8 @@ uint16_t EDNS_ADVERTISED_SIZE = 4096;
 /** minimal responses when positive answer: default is no */
 int MINIMAL_RESPONSES = 0;
 
-/** rrset order roundrobin: default is no */
-int RRSET_ROUNDROBIN = 0;
+/** rrset order roundrobin: default is yes */
+int RRSET_ROUNDROBIN = 1;
 
 /** log tag queries with name instead of 'info' for filtering */
 int LOG_TAG_QUERYREPLY = 0;