Merge branch 'fix/regression_issue_in_digest_auth_v5.5' into 'release/v5.5'

fix(esp_http_client): fixed regression issue during enabling digest auth in client (v5.5)

See merge request espressif/esp-idf!41116
This commit is contained in:
Jiang Jiang Jian
2025-08-08 20:07:13 +08:00

View File

@@ -619,10 +619,10 @@ static esp_err_t esp_http_client_prepare_basic_auth(esp_http_client_handle_t cli
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
auth_response = http_auth_basic(client->connection_info.username, client->connection_info.password); auth_response = http_auth_basic(client->connection_info.username, client->connection_info.password);
ESP_GOTO_ON_FALSE(auth_response, ESP_FAIL, error, TAG, "Failed to generate basic auth response"); if (auth_response) {
ESP_LOGD(TAG, "auth_response=%s", auth_response);
ESP_LOGD(TAG, "auth_response=%s", auth_response); ESP_GOTO_ON_FALSE(ESP_OK == esp_http_client_set_header(client, "Authorization", auth_response), ESP_FAIL, error, TAG, "Failed to set Authorization header");
ESP_GOTO_ON_FALSE(ESP_OK == esp_http_client_set_header(client, "Authorization", auth_response), ESP_FAIL, error, TAG, "Failed to set Authorization header"); }
ret = ESP_OK; ret = ESP_OK;
@@ -651,10 +651,10 @@ static esp_err_t esp_http_client_prepare_digest_auth(esp_http_client_handle_t cl
client->auth_data->cnonce = ((uint64_t)esp_random() << 32) + esp_random(); client->auth_data->cnonce = ((uint64_t)esp_random() << 32) + esp_random();
auth_response = http_auth_digest(client->connection_info.username, client->connection_info.password, client->auth_data); auth_response = http_auth_digest(client->connection_info.username, client->connection_info.password, client->auth_data);
ESP_GOTO_ON_FALSE(auth_response, ESP_FAIL, error, TAG, "Failed to generate digest auth response"); if (auth_response) {
ESP_LOGD(TAG, "auth_response=%s", auth_response);
ESP_LOGD(TAG, "auth_response=%s", auth_response); ESP_GOTO_ON_FALSE(ESP_OK == esp_http_client_set_header(client, "Authorization", auth_response), ESP_FAIL, error, TAG, "Failed to set Authorization header");
ESP_GOTO_ON_FALSE(ESP_OK == esp_http_client_set_header(client, "Authorization", auth_response), ESP_FAIL, error, TAG, "Failed to set Authorization header"); }
ret = ESP_OK; ret = ESP_OK;