Skip to content

Commit 57553ec

Browse files
committed
Merge branch 'bugfix/update_condition_to_verify_http_version' into 'master'
fix(esp_http_server): updated condition to verify http version Closes IDFGH-13878 See merge request espressif/esp-idf!34208
2 parents 9ac6e10 + d66442b commit 57553ec

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

components/esp_http_server/src/httpd_parse.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2018-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -86,7 +86,7 @@ static esp_err_t verify_url (http_parser *parser)
8686
ESP_LOGD(TAG, LOG_FMT("received URI = %s"), r->uri);
8787

8888
/* Make sure version is HTTP/1.1 */
89-
if ((parser->http_major != 1) && (parser->http_minor != 1)) {
89+
if (!((parser->http_major == 1) && (parser->http_minor == 1))) {
9090
ESP_LOGW(TAG, LOG_FMT("unsupported HTTP version = %d.%d"),
9191
parser->http_major, parser->http_minor);
9292
parser_data->error = HTTPD_505_VERSION_NOT_SUPPORTED;
@@ -106,7 +106,7 @@ static esp_err_t verify_url (http_parser *parser)
106106
}
107107

108108
/* http_parser callback on finding url in HTTP request
109-
* Will be invoked ATLEAST once every packet
109+
* Will be invoked AT LEAST once every packet
110110
*/
111111
static esp_err_t cb_url(http_parser *parser,
112112
const char *at, size_t length)
@@ -191,7 +191,7 @@ static size_t continue_parsing(http_parser *parser, size_t length)
191191
}
192192

193193
/* http_parser callback on header field in HTTP request
194-
* May be invoked ATLEAST once every header field
194+
* May be invoked AT LEAST once every header field
195195
*/
196196
static esp_err_t cb_header_field(http_parser *parser, const char *at, size_t length)
197197
{
@@ -250,7 +250,7 @@ static esp_err_t cb_header_field(http_parser *parser, const char *at, size_t len
250250
}
251251

252252
/* http_parser callback on header value in HTTP request.
253-
* May be invoked ATLEAST once every header value
253+
* May be invoked AT LEAST once every header value
254254
*/
255255
static esp_err_t cb_header_value(http_parser *parser, const char *at, size_t length)
256256
{

0 commit comments

Comments
 (0)