From 3938792732010886a1bbdbea8079e74dcc293d6f Mon Sep 17 00:00:00 2001 From: yuanjm Date: Tue, 31 Aug 2021 14:07:59 +0800 Subject: [PATCH] Revert "Merge branch 'bugfix/fix_ws_handle_big_messages_error_v4.3' into 'release/v4.3'" This reverts commit de8c6aaa8d1342a73bc0e0f9e6032ee24fff3916, reversing changes made to ab452839edcbc3c02e7985d6778d21c99782f5a8. --- components/esp_http_server/src/httpd_ws.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/components/esp_http_server/src/httpd_ws.c b/components/esp_http_server/src/httpd_ws.c index 629497fd1b..e9e3377103 100644 --- a/components/esp_http_server/src/httpd_ws.c +++ b/components/esp_http_server/src/httpd_ws.c @@ -332,15 +332,9 @@ esp_err_t httpd_ws_recv_frame(httpd_req_t *req, httpd_ws_frame_t *frame, size_t return ESP_FAIL; } - int read_len = 0, left_len = frame->len; - while (left_len > 0) { - if ((read_len = httpd_recv_with_opt(req, (char *)frame->payload + read_len, left_len, false)) <= 0) { - ESP_LOGW(TAG, LOG_FMT("Failed to receive payload")); - return ESP_FAIL; - } - if (left_len -= read_len) { - ESP_LOGD(TAG, "recv data length is less than the data length we want. Read again!"); - } + if (httpd_recv_with_opt(req, (char *)frame->payload, frame->len, false) <= 0) { + ESP_LOGW(TAG, LOG_FMT("Failed to receive payload")); + return ESP_FAIL; } /* Unmask payload */