From b1125d3ec1411c165b3106414f0b2ea4b3318a5b Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 8 Nov 2021 17:38:59 +0100 Subject: [PATCH] dnsdist: Do not include built-in HTML content when DISABLE_BUILTIN_HTML is defined --- pdns/dnsdist-web.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc index e3cb116d6e..52972c20e8 100644 --- a/pdns/dnsdist-web.cc +++ b/pdns/dnsdist-web.cc @@ -38,7 +38,6 @@ #include "dnsdist-web.hh" #include "dolog.hh" #include "gettime.hh" -#include "htmlfiles.h" #include "threadname.hh" #include "sodcrypto.hh" #include "sstuff.hh" @@ -1369,6 +1368,9 @@ void clearWebHandlers() s_webHandlers.clear(); } +#ifndef DISABLE_BUILTIN_HTML +#include "htmlfiles.h" + static void redirectToIndex(const YaHTTP::Request& req, YaHTTP::Response& resp) { const string charset = "; charset=utf-8"; @@ -1403,6 +1405,7 @@ static void handleBuiltInFiles(const YaHTTP::Request& req, YaHTTP::Response& res resp.status = 200; } +#endif /* DISABLE_BUILTIN_HTML */ void registerBuiltInWebHandlers() { @@ -1415,11 +1418,13 @@ void registerBuiltInWebHandlers() registerWebHandler("/api/v1/servers/localhost/statistics", handleStatsOnly); registerWebHandler("/api/v1/servers/localhost/config", handleConfigDump); registerWebHandler("/api/v1/servers/localhost/config/allow-from", handleAllowFrom); +#ifndef DISABLE_BUILTIN_HTML registerWebHandler("/", redirectToIndex); for (const auto& path : s_urlmap) { registerWebHandler("/" + path.first, handleBuiltInFiles); } +#endif /* DISABLE_BUILTIN_HTML */ } static void connectionThread(WebClientConnection&& conn) -- 2.47.2