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

Merge branch 'bugfix/update_condition_to_verify_http_version_v5.0' into 'release/v5.0'

Browse Source 
fix(esp_http_server): updated condition to verify http version (v5.0)

See merge request espressif/esp-idf!34638
This commit is contained in:
Aditya Patwardhan
2024-11-06 16:40:32 +08:00
parent e991d160c7 63afc49584
commit a974ea3a9a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp_http_server/src/httpd_parse.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2018-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -83,7 +83,7 @@ static esp_err_t verify_url (http_parser *parser)
ESP_LOGD(TAG, LOG_FMT("received URI = %s"), r->uri); ESP_LOGD(TAG, LOG_FMT("received URI = %s"), r->uri);
/* Make sure version is HTTP/1.1 */ /* Make sure version is HTTP/1.1 */
if ((parser->http_major != 1) && (parser->http_minor != 1)) { if (!((parser->http_major == 1) && (parser->http_minor == 1))) {
ESP_LOGW(TAG, LOG_FMT("unsupported HTTP version = %d.%d"), ESP_LOGW(TAG, LOG_FMT("unsupported HTTP version = %d.%d"),
parser->http_major, parser->http_minor); parser->http_major, parser->http_minor);
parser_data->error = HTTPD_505_VERSION_NOT_SUPPORTED; parser_data->error = HTTPD_505_VERSION_NOT_SUPPORTED;
@ -103,7 +103,7 @@ static esp_err_t verify_url (http_parser *parser)
} }
/* http_parser callback on finding url in HTTP request /* http_parser callback on finding url in HTTP request
* Will be invoked ATLEAST once every packet * Will be invoked AT LEAST once every packet
*/ */
static esp_err_t cb_url(http_parser *parser, static esp_err_t cb_url(http_parser *parser,
const char *at, size_t length) const char *at, size_t length)
@ -188,7 +188,7 @@ static size_t continue_parsing(http_parser *parser, size_t length)
} }
/* http_parser callback on header field in HTTP request /* http_parser callback on header field in HTTP request
* May be invoked ATLEAST once every header field * May be invoked AT LEAST once every header field
*/ */
static esp_err_t cb_header_field(http_parser *parser, const char *at, size_t length) static esp_err_t cb_header_field(http_parser *parser, const char *at, size_t length)
{ {
@ -247,7 +247,7 @@ static esp_err_t cb_header_field(http_parser *parser, const char *at, size_t len
} }
/* http_parser callback on header value in HTTP request. /* http_parser callback on header value in HTTP request.
* May be invoked ATLEAST once every header value * May be invoked AT LEAST once every header value
*/ */
static esp_err_t cb_header_value(http_parser *parser, const char *at, size_t length) static esp_err_t cb_header_value(http_parser *parser, const char *at, size_t length)
{ {