mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-18 15:35:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'web_server_missing_macros' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-03 16:38:37 +01:00
parent c93a470e96 7755014a7d
commit a9f3d6a2d9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/web_server/web_server.cpp
View File

@@ -455,7 +455,7 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
#ifdef USE_WEBSERVER_PRIVATE_NETWORK_ACCESS
void WebServer::handle_pna_cors_request(AsyncWebServerRequest *request) {
AsyncWebServerResponse *response = request->beginResponse(200, "");
AsyncWebServerResponse *response = request->beginResponse(200, ESPHOME_F(""));
response->addHeader(ESPHOME_F("Access-Control-Allow-Private-Network"), ESPHOME_F("true"));
response->addHeader(ESPHOME_F("Private-Network-Access-Name"), App.get_name().c_str());
char mac_s[18];
@@ -1977,7 +1977,7 @@ void WebServer::handle_infrared_request(AsyncWebServerRequest *request, const Ur
// Only allow transmit if the device supports it
if (!obj->has_transmitter()) {
request->send(400, ESPHOME_F("text/plain"), "Device does not support transmission");
request->send(400, ESPHOME_F("text/plain"), ESPHOME_F("Device does not support transmission"));
return;
}
@@ -2003,7 +2003,7 @@ void WebServer::handle_infrared_request(AsyncWebServerRequest *request, const Ur
// Parse base64url-encoded raw timings (required)
// Base64url is URL-safe: uses A-Za-z0-9-_ (no special characters needing escaping)
if (!request->hasParam(ESPHOME_F("data"))) {
request->send(400, ESPHOME_F("text/plain"), "Missing 'data' parameter");
request->send(400, ESPHOME_F("text/plain"), ESPHOME_F("Missing 'data' parameter"));
return;
}
@@ -2013,7 +2013,7 @@ void WebServer::handle_infrared_request(AsyncWebServerRequest *request, const Ur
// Validate base64url is not empty
if (encoded.empty()) {
request->send(400, ESPHOME_F("text/plain"), "Empty 'data' parameter");
request->send(400, ESPHOME_F("text/plain"), ESPHOME_F("Empty 'data' parameter"));
return;
}
@@ -2487,7 +2487,7 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
else {
// No matching handler found - send 404
ESP_LOGV(TAG, "Request for unknown URL: %s", url.c_str());
request->send(404, "text/plain", "Not Found");
request->send(404, ESPHOME_F("text/plain"), ESPHOME_F("Not Found"));
}
}

2
esphome/components/web_server/web_server_v1.cpp
View File

@@ -74,7 +74,7 @@ void WebServer::set_css_url(const char *css_url) { this->css_url_ = css_url; }
void WebServer::set_js_url(const char *js_url) { this->js_url_ = js_url; }
void WebServer::handle_index_request(AsyncWebServerRequest *request) {
AsyncResponseStream *stream = request->beginResponseStream("text/html");
AsyncResponseStream *stream = request->beginResponseStream(ESPHOME_F("text/html"));
const std::string &title = App.get_name();
stream->print(ESPHOME_F("<!DOCTYPE html><html lang=\"en\"><head><meta charset=UTF-8><meta "
"name=viewport content=\"width=device-width, initial-scale=1,user-scalable=no\"><title>"));