alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

esp_https_ota: fix bug where http_client_init_cb is called after esp_http_client_perform() instead of before.

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/9581
This commit is contained in:
Harshit Malpani 2022-09-01 12:04:40 +05:30
parent e2634b5223
commit 1c92feae38
No known key found for this signature in database
GPG Key ID: FF1193D150EF75C3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,6 +254,14 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
goto failure; goto failure;
} }
if (ota_config->http_client_init_cb) {
err = ota_config->http_client_init_cb(https_ota_handle->http_client);
if (err != ESP_OK) {
ESP_LOGE(TAG, "http_client_init_cb returned 0x%x", err);
goto http_cleanup;
}
}
if (https_ota_handle->partial_http_download) { if (https_ota_handle->partial_http_download) {
esp_http_client_set_method(https_ota_handle->http_client, HTTP_METHOD_HEAD); esp_http_client_set_method(https_ota_handle->http_client, HTTP_METHOD_HEAD);
err = esp_http_client_perform(https_ota_handle->http_client); err = esp_http_client_perform(https_ota_handle->http_client);
@ -286,14 +294,6 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
esp_http_client_set_method(https_ota_handle->http_client, HTTP_METHOD_GET); esp_http_client_set_method(https_ota_handle->http_client, HTTP_METHOD_GET);
} }
if (ota_config->http_client_init_cb) {
err = ota_config->http_client_init_cb(https_ota_handle->http_client);
if (err != ESP_OK) {
ESP_LOGE(TAG, "http_client_init_cb returned 0x%x", err);
goto http_cleanup;
}
}
err = _http_connect(https_ota_handle->http_client); err = _http_connect(https_ota_handle->http_client);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "Failed to establish HTTP connection"); ESP_LOGE(TAG, "Failed to establish HTTP connection");