Merge branch 'master' into dev-metrics

diff --cc pdns/recursordist/Makefile.am
Simple merge

diff --cc pdns/ws-recursor.cc
Simple merge

diff --cc regression-tests.api/test_Servers.py
index ba64df3a4855c1780b6a1328ee32d20353a3f6fc,6b30359e3861c486bd029d9c1d4d59bab05949f3..66a183058ff8e514181c76ad237316a00e77cadc
--- 1/regression-tests.api/test_Servers.py
--- 2/regression-tests.api/test_Servers.py
+++ b/regression-tests.api/test_Servers.py
@@@ -69,16 -71,8 +71,21 @@@ class Servers(ApiTestCase)
          self.assertEquals(r.status_code, 422)
          self.assertIn("Unknown statistic name", r.json()['error'])
  
- 
 +    def test_read_metrics(self):
 +        if is_recursor():
 +            res = self.session.get(self.url("/metrics"), auth=('whatever', self.webServerBasicAuthPassword), timeout=2.0)
 +            self.assertEqual(res.status_code, 200)
 +            # print(res.text)
 +            found = False
 +            for line in res.text.splitlines():
 +                if line[0] == "#":
 +                    continue
 +                if line.split(" ")[0] == "pdnsrecursor_uptime":
 +                    found = True
 +            self.assertTrue(found,"pdnsrecursor_uptime is missing")
++            
+     @unittest.skipIf(is_auth(), "Not applicable")
+     def test_read_statistics_using_password(self):
+         r = requests.get(self.url("/api/v1/servers/localhost/statistics"), auth=('admin', self.server_web_password))
+         self.assertEquals(r.status_code, requests.codes.ok)
+         self.assert_success_json(r)

diff --cc regression-tests.api/test_helper.py
index 5df46745efc5108c479010670d32564e0d1acd6b,9a6ee028207492a990e26585bf6a28772c55cb5e..c5dbcee20d7a3af699a015fe864088c916cc88f4
--- 1/regression-tests.api/test_helper.py
--- 2/regression-tests.api/test_helper.py
+++ b/regression-tests.api/test_helper.py
@@@ -23,9 -23,9 +23,10 @@@ class ApiTestCase(unittest.TestCase)
      def setUp(self):
          # TODO: config
          self.server_address = '127.0.0.1'
 +        self.webServerBasicAuthPassword = 'something'
          self.server_port = int(os.environ.get('WEBPORT', '5580'))
          self.server_url = 'http://%s:%s/' % (self.server_address, self.server_port)
+         self.server_web_password = os.environ.get('WEBPASSWORD', 'MISSING')
          self.session = requests.Session()
          self.session.headers = {'X-API-Key': os.environ.get('APIKEY', 'changeme-key'), 'Origin': 'http://%s:%s' % (self.server_address, self.server_port)}