Merge branch 'master' into master

diff --cc pdns/dnsdistdist/dnsdist-backend.cc
Simple merge

diff --cc pdns/dnsdistdist/dnsdist-configuration-yaml.cc
Simple merge

diff --cc pdns/dnsdistdist/dnsdist-doh-common.hh
Simple merge

diff --cc pdns/dnsdistdist/dnsdist-lua-bindings-dnsquestion.cc
Simple merge

diff --cc pdns/dnsdistdist/dnsdist-rust-lib/rust-post-in.rs
index 57a74c880e869e57bb030b58123570a7d6a3619b,ed5feaa228bde3d7373b6bb11a2e122ad0c18a3c..c2c68bb43ecd7b14366fda2d137a8b7f506ad330
--- 1/pdns/dnsdistdist/dnsdist-rust-lib/rust-post-in.rs
--- 2/pdns/dnsdistdist/dnsdist-rust-lib/rust-post-in.rs
+++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust-post-in.rs
@@@ -95,16 -88,15 +88,16 @@@ fn get_global_configuration_from_serde
      dnsdistsettings::registerKVSObjects(&config.key_value_stores);
      // this needs to be done BEFORE the rules so that they can refer to the selectors
      // by name
-     config.selectors = get_selectors_from_serde(&serde.selectors);
-     config.query_rules = get_query_rules_from_serde(&serde.query_rules);
-     config.cache_miss_rules = get_query_rules_from_serde(&serde.cache_miss_rules);
-     config.response_rules = get_response_rules_from_serde(&serde.response_rules);
-     config.cache_hit_response_rules = get_response_rules_from_serde(&serde.cache_hit_response_rules);
-     config.cache_inserted_response_rules = get_response_rules_from_serde(&serde.cache_inserted_response_rules);
-     config.self_answered_response_rules = get_response_rules_from_serde(&serde.self_answered_response_rules);
-     config.xfr_response_rules = get_response_rules_from_serde(&serde.xfr_response_rules);
-     config.timeout_response_rules = get_response_rules_from_serde(&serde.timeout_response_rules);
-     config
+     config.selectors = get_selectors_from_serde(&serde.selectors)?;
+     config.query_rules = get_query_rules_from_serde(&serde.query_rules)?;
+     config.cache_miss_rules = get_query_rules_from_serde(&serde.cache_miss_rules)?;
+     config.response_rules = get_response_rules_from_serde(&serde.response_rules)?;
+     config.cache_hit_response_rules = get_response_rules_from_serde(&serde.cache_hit_response_rules)?;
+     config.cache_inserted_response_rules = get_response_rules_from_serde(&serde.cache_inserted_response_rules)?;
+     config.self_answered_response_rules = get_response_rules_from_serde(&serde.self_answered_response_rules)?;
+     config.xfr_response_rules = get_response_rules_from_serde(&serde.xfr_response_rules)?;
++    config.timeout_response_rules = get_response_rules_from_serde(&serde.timeout_response_rules)?;
+     Ok(config)
  }
  
  pub fn from_yaml_string(

diff --cc pdns/dnsdistdist/dnsdist-rust-lib/rust/src/lib.rs
index a02d173ca855160bc0cda9ad6cce4eef0387a160,bb4caa1cb22a2cd8333ac55d3a5650bde5ded581..be2411ba96a4cbe85d9ec3f6e702cbd210f9e39f
--- 1/pdns/dnsdistdist/dnsdist-rust-lib/rust/src/lib.rs
--- 2/pdns/dnsdistdist/dnsdist-rust-lib/rust/src/lib.rs
+++ b/pdns/dnsdistdist/dnsdist-rust-lib/rust/src/lib.rs
@@@ -4500,16 -4503,15 +4509,16 @@@ fn get_global_configuration_from_serde
      dnsdistsettings::registerKVSObjects(&config.key_value_stores);
      // this needs to be done BEFORE the rules so that they can refer to the selectors
      // by name
-     config.selectors = get_selectors_from_serde(&serde.selectors);
-     config.query_rules = get_query_rules_from_serde(&serde.query_rules);
-     config.cache_miss_rules = get_query_rules_from_serde(&serde.cache_miss_rules);
-     config.response_rules = get_response_rules_from_serde(&serde.response_rules);
-     config.cache_hit_response_rules = get_response_rules_from_serde(&serde.cache_hit_response_rules);
-     config.cache_inserted_response_rules = get_response_rules_from_serde(&serde.cache_inserted_response_rules);
-     config.self_answered_response_rules = get_response_rules_from_serde(&serde.self_answered_response_rules);
-     config.xfr_response_rules = get_response_rules_from_serde(&serde.xfr_response_rules);
-     config.timeout_response_rules = get_response_rules_from_serde(&serde.timeout_response_rules);
-     config
+     config.selectors = get_selectors_from_serde(&serde.selectors)?;
+     config.query_rules = get_query_rules_from_serde(&serde.query_rules)?;
+     config.cache_miss_rules = get_query_rules_from_serde(&serde.cache_miss_rules)?;
+     config.response_rules = get_response_rules_from_serde(&serde.response_rules)?;
+     config.cache_hit_response_rules = get_response_rules_from_serde(&serde.cache_hit_response_rules)?;
+     config.cache_inserted_response_rules = get_response_rules_from_serde(&serde.cache_inserted_response_rules)?;
+     config.self_answered_response_rules = get_response_rules_from_serde(&serde.self_answered_response_rules)?;
+     config.xfr_response_rules = get_response_rules_from_serde(&serde.xfr_response_rules)?;
++    config.timeout_response_rules = get_response_rules_from_serde(&serde.timeout_response_rules)?;
+     Ok(config)
  }
  
  pub fn from_yaml_string(

diff --cc pdns/dnsdistdist/dnsdist-settings-definitions.yml
Simple merge

diff --cc pdns/dnsdistdist/dnsdist.cc
Simple merge

diff --cc pdns/dnsdistdist/dnsdist.hh
Simple merge

diff --cc pdns/dnsdistdist/docs/reference/yaml-settings.rst
Simple merge

diff --cc pdns/dnsdistdist/doh.cc
Simple merge

diff --cc regression-tests.dnsdist/dnsdisttests.py
Simple merge