Merge pull request #8879 from rgacogne/ddist-unused-capture

dnsdist: Remove unused lambda capture reported by clang++

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 7b0f5314cc1809f8c67d181081f0e96d30900574..80445cb89485a3e822a29be6e96222ad3b0d564c 100755 (executable)
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -514,7 +514,8 @@ test_auth() {
   run "sudo perl -i -pe 's/\]/]\nThreading=1/g' /etc/odbcinst.ini"
   run "cat /etc/odbcinst.ini"
   run "export GODBC_SQLITE3_DSN=pdns-sqlite3-1"
-  run "./timestamp ./start-test-stop 5300 godbc_sqlite3-nsec3"
+  # this test is unstable on the library versions in the Travis trusty image
+  # run "./timestamp ./start-test-stop 5300 godbc_sqlite3-nsec3"
 
   run "./timestamp ./start-test-stop 5300 gpgsql-nodnssec-both"
   run "./timestamp ./start-test-stop 5300 gpgsql-both"

diff --git a/docs/http-api/index.rst b/docs/http-api/index.rst
index 4a81db80b29adf74eaceb8541cac2a9eea187a86..ae62df5c748c9468114822ecdc3d0595f8585506 100644 (file)
--- a/docs/http-api/index.rst
+++ b/docs/http-api/index.rst
@@ -9,7 +9,7 @@ Webserver
 
 To launch the internal webserver, add a :ref:`setting-webserver` to the configuration file.
 This will instruct PowerDNS to start a webserver on localhost at port 8081, without password protection.
-By default the webserver listens on localhost, meaning only local users (on the same host) will be able to access the webserver. Since the default ACL before 4.1.0 allows access from everywhere if :ref:`setting-webserver-address` is set to a different value, we strongly advise the use of a password protection.
+By default the webserver listens on localhost, meaning only local users (on the same host) will be able to access the webserver. Since the default ACL before 4.1.0 allows access from everywhere if :ref:`setting-webserver-address` is set to a different value, we strongly advise the use of password protection.
 The webserver lists a lot of potentially sensitive information about the PowerDNS process, including frequent queries, frequently failing queries, lists of remote hosts sending queries, hosts sending corrupt queries etc.
 The webserver does not allow remote management of the daemon, but allows control over the size of the queries and response rings that may be used to monitor activities.
 The following webserver related configuration items are available: