sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-04 19:03:47 +01:00
Code Issues Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-03 13:51:01 -05:00
parent 00bd1b0a02
commit 3c1a781a1c
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,11 +106,6 @@ static UrlMatch parse_url(const char *url_ptr, size_t url_len, bool only_domain)
return match; return match;
} }
// Single match_url function that works with any string type
inline UrlMatch match_url(const char *url, size_t len, bool only_domain = false) {
return parse_url(url, len, only_domain);
}
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
// helper for allowing only unique entries in the queue // helper for allowing only unique entries in the queue
void DeferredUpdateEventSource::deq_push_back_with_dedup_(void *source, message_generator_t *message_generator) { void DeferredUpdateEventSource::deq_push_back_with_dedup_(void *source, message_generator_t *message_generator) {
@@ -1757,10 +1752,9 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) const {
// Store the URL to prevent temporary string destruction // Store the URL to prevent temporary string destruction
// request->url() returns a reference to a String (on Arduino) or std::string (on ESP-IDF) // request->url() returns a reference to a String (on Arduino) or std::string (on ESP-IDF)
// If we pass it directly to match_url(), it could create a temporary std::string from Arduino String // UrlMatch stores pointers to the string's data, so we must ensure the string outlives parse_url()
// UrlMatch stores pointers to the string's data, so we must ensure the string outlives match_url()
const auto &url = request->url(); const auto &url = request->url();
UrlMatch match = match_url(url.c_str(), url.length(), true); UrlMatch match = parse_url(url.c_str(), url.length(), true);
if (!match.valid) if (!match.valid)
return false; return false;
#ifdef USE_SENSOR #ifdef USE_SENSOR
@@ -1901,7 +1895,7 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
// See comment in canHandle() for why we store the URL reference // See comment in canHandle() for why we store the URL reference
const auto &url = request->url(); const auto &url = request->url();
UrlMatch match = match_url(url.c_str(), url.length()); UrlMatch match = parse_url(url.c_str(), url.length(), false);
#ifdef USE_SENSOR #ifdef USE_SENSOR
if (match.domain_equals("sensor")) { if (match.domain_equals("sensor")) {