From 35d0b93ecf2c772c05752588ef10a4a4a9cf1b80 Mon Sep 17 00:00:00 2001 From: Shubham Kulkarni Date: Wed, 30 Sep 2020 19:06:13 +0530 Subject: [PATCH] esp_http_client: Skip check for redirection counter if status code is success. Set disable_auto_redirect in esp_http_client example to validate this condition in CI --- components/esp_http_client/esp_http_client.c | 3 +++ components/esp_http_client/include/esp_http_client.h | 4 ++++ .../protocols/esp_http_client/main/esp_http_client_example.c | 1 + 3 files changed, 8 insertions(+) diff --git a/components/esp_http_client/esp_http_client.c b/components/esp_http_client/esp_http_client.c index 72f8cdf53d..6c394f49cb 100644 --- a/components/esp_http_client/esp_http_client.c +++ b/components/esp_http_client/esp_http_client.c @@ -644,6 +644,9 @@ esp_err_t esp_http_client_set_redirection(esp_http_client_handle_t client) static esp_err_t esp_http_check_response(esp_http_client_handle_t client) { + if (client->response->status_code >= HttpStatus_Ok && client->response->status_code < HttpStatus_MultipleChoices) { + return ESP_OK; + } if (client->redirect_counter >= client->max_redirection_count || client->disable_auto_redirect) { ESP_LOGE(TAG, "Error, reach max_redirection_count count=%d", client->redirect_counter); return ESP_ERR_HTTP_MAX_REDIRECT; diff --git a/components/esp_http_client/include/esp_http_client.h b/components/esp_http_client/include/esp_http_client.h index 4ee0ff359b..8284d394b0 100644 --- a/components/esp_http_client/include/esp_http_client.h +++ b/components/esp_http_client/include/esp_http_client.h @@ -125,7 +125,11 @@ typedef struct { * Enum for the HTTP status codes. */ typedef enum { + /* 2xx - Success */ + HttpStatus_Ok = 200, + /* 3xx - Redirection */ + HttpStatus_MultipleChoices = 300, HttpStatus_MovedPermanently = 301, HttpStatus_Found = 302, diff --git a/examples/protocols/esp_http_client/main/esp_http_client_example.c b/examples/protocols/esp_http_client/main/esp_http_client_example.c index 3978671b4c..009b308860 100644 --- a/examples/protocols/esp_http_client/main/esp_http_client_example.c +++ b/examples/protocols/esp_http_client/main/esp_http_client_example.c @@ -72,6 +72,7 @@ static void http_rest_with_url() esp_http_client_config_t config = { .url = "http://httpbin.org/get", .event_handler = _http_event_handler, + .disable_auto_redirect = true, }; esp_http_client_handle_t client = esp_http_client_init(&config);