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 'contrib/github_pr_18818_v5.5' into 'release/v5.5'

Browse Source 
fix(esp_http_client): fix parser wedge and dead error-classification branches on read timeout (GitHub PR) (v5.5)

See merge request espressif/esp-idf!52619
This commit is contained in:
Jiang Jiang Jian
2026-09-10 11:00:57 +08:00
parent ca1b526f67 369cc3d903
commit 593476dfb9
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/esp_http_client/esp_http_client.c
View File

@@ -1313,10 +1313,14 @@ static int esp_http_client_get_data(esp_http_client_handle_t client)
errno = 0;
int rlen = esp_transport_read(client->transport, res_buffer->data, client->buffer_size_rx, client->timeout_ms);
if (rlen >= 0) {
// When tls error is ESP_TLS_ERR_SSL_WANT_READ (-0x6900), esp_trasnport_read returns ERR_TCP_TRANSPORT_CONNECTION_TIMEOUT (0x0).
// We should not execute http_parser_execute() on this condition as it sets the internal state machine in an
// invalid state.
if (!(client->is_async && rlen == 0)) {
// esp_transport_read() returns 0 (ERR_TCP_TRANSPORT_CONNECTION_TIMEOUT) whenever the
// underlying poll times out with no data ready -- e.g. when tls error is
// ESP_TLS_ERR_SSL_WANT_READ (-0x6900) -- and this can happen in blocking mode too, not
// just when client->is_async. We must not execute http_parser_execute() with len==0 in
// this case: a len==0 call is only valid to signal genuine end-of-stream, and calling it
// while the parser is mid-header/mid-body (as it will be on a mid-response stall) sets
// HPE_INVALID_EOF_STATE and permanently wedges the parser for the rest of the connection.
if (rlen != 0) {
http_parser_execute(client->parser, client->parser_settings, res_buffer->data, rlen);
}
}
@@ -1508,9 +1512,16 @@ esp_err_t esp_http_client_perform(esp_http_client_handle_t client)
if (client->connection_info.method != HTTP_METHOD_HEAD && !client->is_chunk_complete) {
ESP_LOGE(TAG, "Incomplete chunked data received %d", ret);
if (ret == ESP_ERR_TCP_TRANSPORT_CONNECTION_TIMEOUT) {
// `ret` is the raw, untranslated value from esp_http_client_get_data()
// (i.e. esp_transport_read()'s own ERR_TCP_TRANSPORT_* enum, e.g. 0/-1),
// not the translated ESP_ERR_TCP_TRANSPORT_* esp_err_t codes (0xe001/0xe002)
// produced by esp_transport_translate_error(). Comparing against the
// translated codes here made both branches below unreachable, so every
// timeout/clean-close during body reading was misreported as the generic
// ESP_ERR_HTTP_INCOMPLETE_DATA.
if (ret == ERR_TCP_TRANSPORT_CONNECTION_TIMEOUT) {
err = ESP_ERR_HTTP_READ_TIMEOUT;
} else if (ret == ESP_ERR_TCP_TRANSPORT_CONNECTION_CLOSED_BY_FIN) {
} else if (ret == ERR_TCP_TRANSPORT_CONNECTION_CLOSED_BY_FIN) {
err = ESP_ERR_HTTP_CONNECTION_CLOSED;
} else {
err = ESP_ERR_HTTP_INCOMPLETE_DATA;
@@ -1529,9 +1540,9 @@ esp_err_t esp_http_client_perform(esp_http_client_handle_t client)
if (client->connection_info.method != HTTP_METHOD_HEAD && client->response->data_process < client->response->content_length) {
ESP_LOGE(TAG, "Incomlete data received, ret=%d, %"PRId64"/%"PRId64" bytes", ret, client->response->data_process, client->response->content_length);
if (ret == ESP_ERR_TCP_TRANSPORT_CONNECTION_TIMEOUT) {
if (ret == ERR_TCP_TRANSPORT_CONNECTION_TIMEOUT) {
err = ESP_ERR_HTTP_READ_TIMEOUT;
} else if (ret == ESP_ERR_TCP_TRANSPORT_CONNECTION_CLOSED_BY_FIN) {
} else if (ret == ERR_TCP_TRANSPORT_CONNECTION_CLOSED_BY_FIN) {
err = ESP_ERR_HTTP_CONNECTION_CLOSED;
} else {
err = ESP_ERR_HTTP_INCOMPLETE_DATA;