Merge pull request #3754 from rgacogne/dnsdist-custom-headers

dnsdist: Allow the use of custom headers in the web server

diff --cc pdns/README-dnsdist.md
Simple merge

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

diff --cc pdns/dnsdist-web.cc
index 4ebda9cfa72f4d08b06c3afb59c7102488664884,45143573178f3f188d64fd9f8f046258933e2fb9..52f1719616bc94008b0a2e7994d69f06aab3d9ee
--- 1/pdns/dnsdist-web.cc
--- 2/pdns/dnsdist-web.cc
+++ b/pdns/dnsdist-web.cc
@@@ -87,14 -120,12 +120,13 @@@ static void connectionThread(int sock, 
  
      req.getvars.erase("_"); // jQuery cache buster
  
 -    YaHTTP::Response resp(req);
 +    YaHTTP::Response resp;
 +    resp.version = req.version;
      const string charset = "; charset=utf-8";
-     resp.headers["X-Content-Type-Options"] = "nosniff";
-     resp.headers["X-Frame-Options"] = "deny";
-     resp.headers["X-Permitted-Cross-Domain-Policies"] = "none";
-     resp.headers["X-XSS-Protection"] = "1; mode=block";
-     resp.headers["Content-Security-Policy"] = "default-src 'self'; style-src 'self' 'unsafe-inline'";
+ 
+     addCustomHeaders(resp, customHeaders);
+     addSecurityHeaders(resp, customHeaders);
+ 
      /* no need to send back the API key if any */
      resp.headers.erase("X-API-Key");
  

diff --cc pdns/dnsdist.hh
Simple merge