1
0
mirror of https://github.com/esphome/esphome.git synced 2025-10-29 22:24:26 +00:00

Merge remote-tracking branch 'origin/integration' into integration

This commit is contained in:
J. Nick Koston
2025-06-29 18:33:46 -05:00
4 changed files with 281 additions and 2 deletions

View File

@@ -1753,7 +1753,7 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) const {
}
#endif
UrlMatch match = match_url(request->url(), true); // NOLINT
UrlMatch match = match_url(request->url().c_str(), true); // NOLINT
if (!match.valid)
return false;
#ifdef USE_SENSOR
@@ -1892,7 +1892,7 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
}
#endif
UrlMatch match = match_url(request->url()); // NOLINT
UrlMatch match = match_url(request->url().c_str()); // NOLINT
#ifdef USE_SENSOR
if (match.domain_equals("sensor")) {
this->handle_sensor_request(request, match);

View File

@@ -101,8 +101,11 @@
#define USE_AUDIO_FLAC_SUPPORT
#define USE_AUDIO_MP3_SUPPORT
#define USE_API
#define USE_API_CLIENT_CONNECTED_TRIGGER
#define USE_API_CLIENT_DISCONNECTED_TRIGGER
#define USE_API_NOISE
#define USE_API_PLAINTEXT
#define USE_API_YAML_SERVICES
#define USE_MD5
#define USE_MQTT
#define USE_NETWORK