Merge branch 'espressif:release/v5.4' into release/v5.4

Author: Jason2866

.gitlab/ci/common.yml

@@ -40,7 +40,7 @@ variables:
   GIT_FETCH_EXTRA_FLAGS: "--no-recurse-submodules --prune --prune-tags"
   # we're using .cache folder for caches
   GIT_CLEAN_FLAGS: -ffdx -e .cache/
-  LATEST_GIT_TAG: v5.4-rc1
+  LATEST_GIT_TAG: v5.4
 
   SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py"
   # by default we will fetch all submodules

components/esp_http_server/include/esp_http_server.h

@@ -569,7 +569,7 @@ typedef enum {
      */
     HTTPD_501_METHOD_NOT_IMPLEMENTED,
 
-    /* When HTTP version is not 1.1 */
+    /* When HTTP version is not 1.1 or 1.0*/
     HTTPD_505_VERSION_NOT_SUPPORTED,
 
     /* Returned when http_parser halts parsing due to incorrect

components/esp_http_server/src/httpd_parse.c

@@ -85,8 +85,8 @@ static esp_err_t verify_url (http_parser *parser)
     strlcpy((char *)r->uri, at, (length + 1));
     ESP_LOGD(TAG, LOG_FMT("received URI = %s"), r->uri);
 
-    /* Make sure version is HTTP/1.1 */
-    if (!((parser->http_major == 1) && (parser->http_minor == 1))) {
+    /* Make sure version is HTTP/1.1 or HTTP/1.0 (legacy compliance purpose) */
+    if (!((parser->http_major == 1) && ((parser->http_minor == 0) || (parser->http_minor == 1)))) {
         ESP_LOGW(TAG, LOG_FMT("unsupported HTTP version = %d.%d"),
                  parser->http_major, parser->http_minor);
         parser_data->error = HTTPD_505_VERSION_NOT_SUPPORTED;

components/esp_hw_support/port/esp32c2/Kconfig.hw_support

@@ -31,26 +31,21 @@ config ESP_REV_MIN_FULL
     # MAX Revision
     #
 
-    comment "Maximum Supported ESP32-C2 Revision (Rev v1.99)"
+    comment "Maximum Supported ESP32-C2 Revision (Rev v2.99)"
     # Maximum revision that IDF supports.
     # It can not be changed by user.
     # Only Espressif can change it when a new version will be supported in IDF.
     # Supports all chips starting from ESP32C2_REV_MIN_FULL to ESP32C2_REV_MAX_FULL
 
 config ESP32C2_REV_MAX_FULL
     int
-    default 299 if ESP32C2_REV2_DEVELOPMENT
-    default 199 if !ESP32C2_REV2_DEVELOPMENT
+    default 299
     # keep in sync the "Maximum Supported Revision" description with this value
 
 config ESP_REV_MAX_FULL
     int
     default ESP32C2_REV_MAX_FULL
 
-config ESP32C2_REV2_DEVELOPMENT
-    bool "Develop on ESP32-C2 v2.0 (Preview)"
-    default y if IDF_CI_BUILD
-
 config ESP_EFUSE_BLOCK_REV_MIN_FULL
     int "Minimum Supported ESP32-C2 eFuse Block Revision"
     default 0