From c79a907e4fef0c54175ad5659bc0df45a40745c9 Mon Sep 17 00:00:00 2001 From: yuanjm Date: Fri, 19 Feb 2021 15:50:42 +0800 Subject: [PATCH] components: Remove repeated keep alive function by ssl layer function In esp_http_client and esp_websocket_client components, esp_transport_tcp_set_keep_alive has been called and keep-alive config has been saved in ssl->cfg.keep_alive_cfg, So no need to call esp_transport_ssl_set_keep_alive again. --- components/esp_http_client/esp_http_client.c | 4 ---- components/esp_websocket_client/esp_websocket_client.c | 1 - 2 files changed, 5 deletions(-) diff --git a/components/esp_http_client/esp_http_client.c b/components/esp_http_client/esp_http_client.c index fbdb575376..33b928559a 100644 --- a/components/esp_http_client/esp_http_client.c +++ b/components/esp_http_client/esp_http_client.c @@ -623,10 +623,6 @@ esp_http_client_handle_t esp_http_client_init(const esp_http_client_config_t *co if (config->skip_cert_common_name_check) { esp_transport_ssl_skip_common_name_check(ssl); } - - if (config->keep_alive_enable == true) { - esp_transport_ssl_set_keep_alive(ssl, &client->keep_alive_cfg); - } #endif if (_set_config(client, config) != ESP_OK) { diff --git a/components/esp_websocket_client/esp_websocket_client.c b/components/esp_websocket_client/esp_websocket_client.c index c9bb0fd324..2f6405d47d 100644 --- a/components/esp_websocket_client/esp_websocket_client.c +++ b/components/esp_websocket_client/esp_websocket_client.c @@ -381,7 +381,6 @@ esp_websocket_client_handle_t esp_websocket_client_init(const esp_websocket_clie if (config->skip_cert_common_name_check) { esp_transport_ssl_skip_common_name_check(ssl); } - esp_transport_ssl_set_keep_alive(ssl, &client->keep_alive_cfg); esp_transport_handle_t wss = esp_transport_ws_init(ssl); ESP_WS_CLIENT_MEM_CHECK(TAG, wss, goto _websocket_init_fail);