jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-06 18:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'idf_webserver_guard' into integration

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-05 22:26:54 -05:00
commit bdd25c7268
No known key found for this signature in database
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/web_server_idf/web_server_idf.cpp
View File

@ -37,6 +37,12 @@ namespace web_server_idf {
static const char *const TAG = "web_server_idf"; static const char *const TAG = "web_server_idf";
// Global instance to avoid guard variable (saves 8 bytes)
// This is initialized at program startup before any threads
static DefaultHeaders default_headers_instance;
DefaultHeaders &DefaultHeaders::Instance() { return default_headers_instance; }
void AsyncWebServer::end() { void AsyncWebServer::end() {
if (this->server_) { if (this->server_) {
httpd_stop(this->server_); httpd_stop(this->server_);

5
esphome/components/web_server_idf/web_server_idf.h
View File

@ -328,10 +328,7 @@ class DefaultHeaders {
void addHeader(const char *name, const char *value) { this->headers_.emplace_back(name, value); } void addHeader(const char *name, const char *value) { this->headers_.emplace_back(name, value); }
// NOLINTNEXTLINE(readability-identifier-naming) // NOLINTNEXTLINE(readability-identifier-naming)
static DefaultHeaders &Instance() { static DefaultHeaders &Instance();
static DefaultHeaders instance;
return instance;
}
protected: protected:
std::vector<std::pair<std::string, std::string>> headers_; std::vector<std::pair<std::string, std::string>> headers_;