Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-09 17:57:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

webui(build): last-modified as .html build value, not .cpp

Browse Source 
also convert strings at comptime, ensure strlen never gets called
This commit is contained in:
Maxim Prokhorov
2025-04-01 03:17:26 +03:00
parent 00c3df0954
commit a18913358c
12 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/espurna/web.cpp
View File

@@ -209,7 +209,6 @@ size_t RequestPrint::write(const uint8_t* data, size_t size) {
namespace {
PROGMEM_STRING(LastModified, __DATE__ " " __TIME__ " GMT");
static constexpr size_t WebConfigBufferMax { 4096 };
// server instance can't (yet) be static, port is the ctor argument :/
@@ -471,7 +470,7 @@ void _onHome(AsyncWebServerRequest *request) {
if (request->hasHeader(FPSTR(IfModifiedSince))) {
const auto value = request->header(FPSTR(IfModifiedSince));
if (strncmp_P(value.c_str(), LastModified, value.length()) == 0) {
if (strncmp_P(value.c_str(), webui_last_modified, value.length()) == 0) {
request->send(304);
return;
}
@@ -496,11 +495,14 @@ void _onHome(AsyncWebServerRequest *request) {
auto* response = request->beginResponse_P(200, F("text/html"), webui_data, std::size(webui_data));
#endif
if (__builtin_strlen(webui_content_encoding) != 0) {
response->addHeader(F("Content-Encoding"), webui_content_encoding);
constexpr auto content_encoding = espurna::StringView(webui_content_encoding);
if (content_encoding.length()) {
response->addHeader(F("Content-Encoding"), content_encoding.toString());
}
response->addHeader(F("Last-Modified"), FPSTR(LastModified));
constexpr auto last_modified = espurna::StringView(webui_last_modified);
response->addHeader(F("Last-Modified"), last_modified.toString());
response->addHeader(F("X-XSS-Protection"), F("1; mode=block"));
response->addHeader(F("X-Content-Type-Options"), F("nosniff"));
response->addHeader(F("X-Frame-Options"), F("deny"));