Skip to content

Commit 95145c3

Browse files
committed
Merge branch 'bugfix/ota_failed_with_openssl_3.0.2' into 'master'
fix(esp_http_client): Fix ota failure with openssl server Closes IDFGH-13879 and IDF-7885 See merge request espressif/esp-idf!34189
2 parents 9b112e0 + 8d8b3fc commit 95145c3

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

components/esp_http_client/esp_http_client.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,15 +1247,15 @@ int esp_http_client_read(esp_http_client_handle_t client, char *buffer, int len)
12471247
ESP_LOGD(TAG, "need_read=%d, byte_to_read=%d, rlen=%d, ridx=%d", need_read, byte_to_read, rlen, ridx);
12481248

12491249
if (rlen <= 0) {
1250+
esp_log_level_t sev = ESP_LOG_WARN;
1251+
/* Check for cleanly closed connection */
1252+
if (rlen == ERR_TCP_TRANSPORT_CONNECTION_CLOSED_BY_FIN && client->response->is_chunked) {
1253+
/* Explicit call to parser for invoking `message_complete` callback */
1254+
http_parser_execute(client->parser, client->parser_settings, res_buffer->data, 0);
1255+
/* ...and lowering the message severity, as closed connection from server side is expected in chunked transport */
1256+
sev = ESP_LOG_DEBUG;
1257+
}
12501258
if (errno != 0) {
1251-
esp_log_level_t sev = ESP_LOG_WARN;
1252-
/* Check for cleanly closed connection */
1253-
if (rlen == ERR_TCP_TRANSPORT_CONNECTION_CLOSED_BY_FIN && client->response->is_chunked) {
1254-
/* Explicit call to parser for invoking `message_complete` callback */
1255-
http_parser_execute(client->parser, client->parser_settings, res_buffer->data, 0);
1256-
/* ...and lowering the message severity, as closed connection from server side is expected in chunked transport */
1257-
sev = ESP_LOG_DEBUG;
1258-
}
12591259
ESP_LOG_LEVEL(sev, TAG, "esp_transport_read returned:%d and errno:%d ", rlen, errno);
12601260
}
12611261

0 commit comments

Comments
 (0)