Use ENABLE_HTTPD alone; update httpd opts

Remove ENABLE_CONTENT from GD32 build files and treat ENABLE_HTTPD as sufficient for web/browser support. Update ArtNet controller/node to report WebBrowserSupport when ENABLE_HTTPD is defined (no longer requires ENABLE_CONTENT). Adjust HTTPD handler GCC pragmas to use CONFIG_HTTPD_OPTIMIZE_NONE to disable optimizations, prefer O3 if configured, otherwise O2. Also remove the ENABLE_CONTENT compile guard around serving embedded content so content handling is compiled with the HTTPD build.

Author: vanvught

gd32_emac_artnet_dmx_multi/Common.mk

@@ -15,7 +15,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
 
 DEFINES+=DISPLAY_UDF 
 
-DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
+DEFINES+=ENABLE_HTTPD
 
 DEFINES+=DISABLE_RTC
 DEFINES+=DISABLE_FS

gd32_emac_e131_dmx_multi/Common.mk

@@ -6,7 +6,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
 
 DEFINES+=DISPLAY_UDF 
 
-DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
+DEFINES+=ENABLE_HTTPD
 
 DEFINES+=DISABLE_RTC
 DEFINES+=DISABLE_FS

gd32_emac_e131_dmx_multi/Makefile.GD32

@@ -14,7 +14,7 @@ DEFINES+=ENET_RXBUF_NUM=16 ENET_TXBUF_NUM=4
 
 DEFINES+=DISPLAY_UDF
 
-DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
+DEFINES+=ENABLE_HTTPD
 
 DEFINES+=DISABLE_RTC
 DEFINES+=DISABLE_FS

lib-artnet/src/controller/artnetcontroller.cpp

@@ -103,7 +103,7 @@ ArtNetController::ArtNetController()
     art_poll_reply_.status2 &= static_cast<uint8_t>(~artnet::Status2::kDhcpCapable);
     art_poll_reply_.status2 |= network::iface::IsDhcpCapable() ? artnet::Status2::kDhcpCapable : static_cast<uint8_t>(0);
 
-#if defined(ENABLE_HTTPD) && defined(ENABLE_CONTENT)
+#if defined(ENABLE_HTTPD)
     art_poll_reply_.status2 |= artnet::Status2::kWebBrowserSupport;
 #endif
 

lib-artnet/src/node/artnetnode.cpp

@@ -174,7 +174,7 @@ void ArtNetNode::Start()
         artnet::Status2::kPortAddress15Bit | (artnet::kVersion >= 4 ? artnet::Status2::kSacnAbleToSwitch : artnet::Status2::kSacnNoSwitch);
     art_poll_reply_.status2 &= static_cast<uint8_t>(~artnet::Status2::kDhcpCapable);
     art_poll_reply_.status2 |= network::iface::IsDhcpCapable() ? artnet::Status2::kDhcpCapable : static_cast<uint8_t>(0);
-#if defined(ENABLE_HTTPD) && defined(ENABLE_CONTENT)
+#if defined(ENABLE_HTTPD)
     art_poll_reply_.status2 |= artnet::Status2::kWebBrowserSupport;
 #endif
 #if defined(OUTPUT_HAVE_STYLESWITCH)

lib-remoteconfig/src/httpd/httpdhandlerequest.cpp

@@ -26,12 +26,12 @@
 #undef NDEBUG
 #endif
 #if defined(__GNUC__) && !defined(__clang__)
-#if defined(CONFIG_HTTPD_OPTIMIZE_O2) || defined(CONFIG_HTTPD_OPTIMIZE_O3)
+#if !defined(CONFIG_HTTPD_OPTIMIZE_NONE)
 #pragma GCC push_options
-#if defined(CONFIG_HTTPD_OPTIMIZE_O2)
-#pragma GCC optimize("O2")
-#else
+#if defined(CONFIG_HTTPD_OPTIMIZE_O3)
 #pragma GCC optimize("O3")
+#else
+#pragma GCC optimize("O2")
 #endif
 #endif
 #endif
@@ -519,7 +519,6 @@ http::Status HttpDeamonHandleRequest::HandleGet()
             }
         }
     }
-#if defined(ENABLE_CONTENT)
     else
     {
         const auto kIndex = html::GetFileIndex(uri_);
@@ -535,7 +534,6 @@ http::Status HttpDeamonHandleRequest::HandleGet()
             content_ = GetFileContent(&uri_[1], length, request_content_type_);
         }
     }
-#endif
 
     if (length == 0)
     {