Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/handle_return_code_304_during_ota_head_request_v6.0' into 'release/v6.0'

Browse Source 
fix: handle return code 304 during HTTP HEAD request in partial OTA (v6.0)

See merge request espressif/esp-idf!49763
This commit is contained in:
Mahavir Jain
2026-06-29 11:18:37 +05:30
parent 3807632d83 6baace8c7c
commit 9f97a4dcd0
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
components/esp_https_ota/src/esp_https_ota.c
View File

@@ -411,24 +411,33 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
err = esp_http_client_perform(https_ota_handle->http_client);
if (err == ESP_OK) {
int status = esp_http_client_get_status_code(https_ota_handle->http_client);
if (status != HttpStatus_Ok) {
// If server doesn't support HEAD request, we need to get image length from GET request
// using Range header
if (status == HttpStatus_Ok) {
https_ota_handle->image_length = esp_http_client_get_content_length(https_ota_handle->http_client);
} else if (status == HttpStatus_NotModified) {
// No new image to download; report it from the HEAD response instead of issuing a redundant GET
err = ESP_ERR_HTTP_NOT_MODIFIED;
goto http_cleanup;
} else {
// HEAD not usable (e.g. 405/501, or 403 for GET-signed URLs); fall back to a ranged GET
ESP_LOGD(TAG, "HEAD request returned status %d, falling back to ranged GET", status);
esp_http_client_set_header(https_ota_handle->http_client, "Range", "bytes=0-0");
esp_http_client_set_method(https_ota_handle->http_client, HTTP_METHOD_GET);
err = esp_http_client_perform(https_ota_handle->http_client);
if (err == ESP_OK) {
status = esp_http_client_get_status_code(https_ota_handle->http_client);
if (status != HttpStatus_Ok && status != HttpStatus_PartialContent) {
ESP_LOGE(TAG, "Received incorrect http status %d", status);
err = ESP_FAIL;
goto http_cleanup;
}
} else {
if (err != ESP_OK) {
ESP_LOGE(TAG, "ESP HTTP client perform failed: %d", err);
goto http_cleanup;
}
status = esp_http_client_get_status_code(https_ota_handle->http_client);
err = _http_handle_response_code(https_ota_handle, status);
if (err != ESP_OK) {
goto http_cleanup;
}
if (status != HttpStatus_Ok && status != HttpStatus_PartialContent) {
ESP_LOGE(TAG, "Received incorrect http status %d", status);
err = ESP_FAIL;
goto http_cleanup;
}
esp_http_client_set_header(https_ota_handle->http_client, "Range", NULL);
if (status == HttpStatus_Ok) {
@@ -438,8 +447,6 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
// If server responds with 206 Partial Content, we can get image length from content-range header
https_ota_handle->image_length = esp_http_client_get_content_range(https_ota_handle->http_client);
}
} else {
https_ota_handle->image_length = esp_http_client_get_content_length(https_ota_handle->http_client);
}
} else {
ESP_LOGE(TAG, "ESP HTTP client perform failed: %d", err);