Merge remote-tracking branch 'origin/master' into api-tsig-keys

diff --cc docs/http-api/index.rst
index 463c2c93ba0b14ee18b2fd975367f23ad2d96126,91b4bc0c769d2104c87303e834bc3d571ed20827..55cf9bcc90e2467f7c14ce14dbbade5d2dfed66f
--- 1/docs/http-api/index.rst
--- 2/docs/http-api/index.rst
+++ b/docs/http-api/index.rst
@@@ -93,6 -101,6 +93,7 @@@ The API exposes several endpoints and o
    zone
    cryptokey
    metadata
 +  tsigkey
    search
    statistics
+   cache

diff --cc docs/http-api/swagger/authoritative-api-swagger.yaml
index 056794667fdc147b0c03a142e2006a5315f5eb83,6d02121875d60d9aa75574de0aae5804306d6e95..a5e33641c6914b25d1e5ea6cc0f7330937e95f83
--- 1/docs/http-api/swagger/authoritative-api-swagger.yaml
--- 2/docs/http-api/swagger/authoritative-api-swagger.yaml
+++ b/docs/http-api/swagger/authoritative-api-swagger.yaml
@@@ -1250,16 -1114,13 +1281,27 @@@ definitions
          type: integer
          description: 'The size of the key'
  
 +  Error:
 +    title: Error
 +    descripton: 'Returned when the server encounters an error. Either in client input or internally'
 +    properties:
 +      error:
 +        type: string
 +        description: 'A human readable error message'
 +        required: true
 +      errors:
 +        type: array
 +        items:
 +          type: string
 +        description: 'Optional array of multiple errors encountered during processing'
++
+   CacheFlushResult:
+     title: CacheFlushResult
+     description: 'The result of a cache-flush'
+     properties:
+       count:
+         type: number
+         description: 'Amount of entries flushed'
+       result:
+         type: string
+         description: 'A message about the result like "Flushed cache"'

diff --cc pdns/Makefile.am
index 8cdfb40f769cd98bdf94e4c37d733adcba656f5c,9304dcd61d64af001805c8ad9e178b4fb33e32d4..61584983b7ed2af44f6e3b4870e8a49badbfba05
--- 1/pdns/Makefile.am
--- 2/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -223,8 -218,8 +218,9 @@@ pdns_server_SOURCES = 
        statbag.cc statbag.hh \
        stubresolver.cc stubresolver.hh \
        tcpreceiver.cc tcpreceiver.hh \
+       threadname.hh threadname.cc \
        tsigverifier.cc tsigverifier.hh \
 +      tsigutils.hh tsigutils.cc \
        tkey.cc \
        ueberbackend.cc ueberbackend.hh \
        unix_semaphore.cc \
@@@ -338,7 -328,7 +329,8 @@@ pdnsutil_SOURCES = 
        sstuff.hh \
        statbag.cc \
        stubresolver.cc stubresolver.hh \
+       threadname.hh threadname.cc \
 +      tsigutils.hh tsigutils.cc \
        ueberbackend.cc \
        unix_utility.cc \
        zoneparser-tng.cc

diff --cc pdns/pdnsutil.cc
Simple merge

diff --cc pdns/webserver.cc
Simple merge

diff --cc pdns/ws-auth.cc
index c274312763d4d2ea1748676ed869e951207e06b4,e025d2b4349f074f6d481839601dd2b30e228378..52357a98ca09476bd5e1d14725ca25128816d794
--- 1/pdns/ws-auth.cc
--- 2/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@@ -45,7 -44,7 +45,8 @@@
  #include "zoneparser-tng.hh"
  #include "common_startup.hh"
  #include "auth-caches.hh"
+ #include "threadname.hh"
 +#include "tsigutils.hh"
  
  using json11::Json;
  

diff --cc regression-tests.api/test_Zones.py
Simple merge