feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/httpd_file_serving_example_chunked_resp' into 'master'

Browse Source 
file_server: fix issue with sending last chunk

Closes IDFGH-2414

See merge request espressif/esp-idf!7089
This commit is contained in:
Mahavir Jain
2019-12-27 14:44:02 +08:00
parent e0b667804f 9ef8cafeca
commit b5b30736de
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/protocols/http_server/file_serving/main/file_server.c
View File

@@ -256,15 +256,17 @@ static esp_err_t download_get_handler(httpd_req_t *req)
/* Read file in chunks into the scratch buffer */ /* Read file in chunks into the scratch buffer */
chunksize = fread(chunk, 1, SCRATCH_BUFSIZE, fd); chunksize = fread(chunk, 1, SCRATCH_BUFSIZE, fd);
/* Send the buffer contents as HTTP response chunk */ if (chunksize > 0) {
if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) { /* Send the buffer contents as HTTP response chunk */
fclose(fd); if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) {
ESP_LOGE(TAG, "File sending failed!"); fclose(fd);
/* Abort sending file */ ESP_LOGE(TAG, "File sending failed!");
httpd_resp_sendstr_chunk(req, NULL); /* Abort sending file */
/* Respond with 500 Internal Server Error */ httpd_resp_sendstr_chunk(req, NULL);
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to send file"); /* Respond with 500 Internal Server Error */
return ESP_FAIL; httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to send file");
return ESP_FAIL;
}
} }
/* Keep looping till the whole file is sent */ /* Keep looping till the whole file is sent */