espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

HTTP Server : Automated 408 error response restricted to timeout in receiving packet header

Browse Source
This commit is contained in:
Anurag Kar
2018-10-09 18:04:37 +05:30
parent ae5989528e
commit 1437646ae0
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/http_server/src/httpd_parse.c
View File

@@ -86,7 +86,7 @@ static esp_err_t verify_url (http_parser *parser)
} }
/* Keep URI with terminating null character. Note URI string pointed /* Keep URI with terminating null character. Note URI string pointed
* by 'at' is not NULL terminated, therfore use length provided by * by 'at' is not NULL terminated, therefore use length provided by
* parser while copying the URI to buffer */ * parser while copying the URI to buffer */
strlcpy((char *)r->uri, at, (length + 1)); strlcpy((char *)r->uri, at, (length + 1));
ESP_LOGD(TAG, LOG_FMT("received URI = %s"), r->uri); ESP_LOGD(TAG, LOG_FMT("received URI = %s"), r->uri);
@@ -291,7 +291,7 @@ static esp_err_t cb_headers_complete(http_parser *parser)
return ESP_FAIL; return ESP_FAIL;
} }
/* In absence of body/chunked enoding, http_parser sets content_len to -1 */ /* In absence of body/chunked encoding, http_parser sets content_len to -1 */
r->content_len = ((int)parser->content_length != -1 ? r->content_len = ((int)parser->content_length != -1 ?
parser->content_length : 0); parser->content_length : 0);
@@ -391,14 +391,14 @@ static int read_block(httpd_req_t *req, size_t offset, size_t length)
} }
/* Receive data into buffer. If data is pending (from unrecv) then return /* Receive data into buffer. If data is pending (from unrecv) then return
* immediatly after receiving pending data, as pending data may just complete * immediately after receiving pending data, as pending data may just complete
* this request packet. */ * this request packet. */
int nbytes = httpd_recv_with_opt(req, raux->scratch + offset, buf_len, true); int nbytes = httpd_recv_with_opt(req, raux->scratch + offset, buf_len, true);
if (nbytes < 0) { if (nbytes < 0) {
ESP_LOGD(TAG, LOG_FMT("error in httpd_recv")); ESP_LOGD(TAG, LOG_FMT("error in httpd_recv"));
/* Connection error. Notify Timeout in all cases. if (nbytes == HTTPD_SOCK_ERR_TIMEOUT) {
* Need some way to check errno for ETIMEDOUT. */
httpd_resp_send_err(req, HTTPD_408_REQ_TIMEOUT); httpd_resp_send_err(req, HTTPD_408_REQ_TIMEOUT);
}
return -1; return -1;
} else if (nbytes == 0) { } else if (nbytes == 0) {
ESP_LOGD(TAG, LOG_FMT("connection closed")); ESP_LOGD(TAG, LOG_FMT("connection closed"));
@@ -500,7 +500,7 @@ static esp_err_t httpd_parse_req(struct httpd_data *hd)
http_parser parser; http_parser parser;
parser_data_t parser_data; parser_data_t parser_data;
/* Initilaize parser */ /* Initialize parser */
parse_init(r, &parser, &parser_data); parse_init(r, &parser, &parser_data);
/* Set offset to start of scratch buffer */ /* Set offset to start of scratch buffer */

1
components/http_server/src/httpd_uri.c
View File

@@ -216,7 +216,6 @@ esp_err_t httpd_uri(struct httpd_data *hd)
if (uri->handler(req) != ESP_OK) { if (uri->handler(req) != ESP_OK) {
/* Handler returns error, this socket should be closed */ /* Handler returns error, this socket should be closed */
ESP_LOGW(TAG, LOG_FMT("uri handler execution failed")); ESP_LOGW(TAG, LOG_FMT("uri handler execution failed"));
httpd_resp_send_err(req, HTTPD_408_REQ_TIMEOUT);
return ESP_FAIL; return ESP_FAIL;
} }
return ESP_OK; return ESP_OK;