From d2aba1bce76c75a9d5fa9bbad8ccc133948e741d Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Sun, 5 Sep 2021 03:11:12 +0800
Subject: [PATCH 1/2] [TD-6217]<fix>: fixed memory leak that caused by invalid
 http requests

---
 src/plugins/http/inc/httpInt.h     | 1 +
 src/plugins/http/src/httpContext.c | 5 +++--
 src/plugins/http/src/httpParser.c  | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/http/inc/httpInt.h b/src/plugins/http/inc/httpInt.h
index 99a5b770aa..6c567e23bc 100644
--- a/src/plugins/http/inc/httpInt.h
+++ b/src/plugins/http/inc/httpInt.h
@@ -147,6 +147,7 @@ typedef struct HttpContext {
   int32_t      state;
   uint8_t      reqType;
   uint8_t      parsed;
+  uint8_t      error;
   char         ipstr[22];
   char         user[TSDB_USER_LEN];  // parsed from auth token or login message
   char         pass[HTTP_PASSWORD_LEN];
diff --git a/src/plugins/http/src/httpContext.c b/src/plugins/http/src/httpContext.c
index 51adef11b9..11945453c5 100644
--- a/src/plugins/http/src/httpContext.c
+++ b/src/plugins/http/src/httpContext.c
@@ -188,11 +188,12 @@ void httpCloseContextByApp(HttpContext *pContext) {
   pContext->parsed = false;
   bool keepAlive = true;
 
-  if (parser && parser->httpVersion == HTTP_VERSION_10 && parser->keepAlive != HTTP_KEEPALIVE_ENABLE) {
+  if (pContext->error == true) {
+    keepAlive = false;
+  } else if (parser && parser->httpVersion == HTTP_VERSION_10 && parser->keepAlive != HTTP_KEEPALIVE_ENABLE) {
     keepAlive = false;
   } else if (parser && parser->httpVersion != HTTP_VERSION_10 && parser->keepAlive == HTTP_KEEPALIVE_DISABLE) {
     keepAlive = false;
-  } else {
   }
 
   if (keepAlive) {
diff --git a/src/plugins/http/src/httpParser.c b/src/plugins/http/src/httpParser.c
index 02f21037b8..25ba096417 100644
--- a/src/plugins/http/src/httpParser.c
+++ b/src/plugins/http/src/httpParser.c
@@ -1157,6 +1157,10 @@ static int32_t httpParseChar(HttpParser *parser, const char c, int32_t *again) {
     httpOnError(parser, HTTP_CODE_INTERNAL_SERVER_ERROR, TSDB_CODE_HTTP_PARSE_ERROR_STATE);
   }
 
+  if (ok != 0) {
+    pContext->error = 1;
+  }
+
   return ok;
 }
 

From 28baf1e536e09bab5755166113198d0975176cf7 Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Tue, 7 Sep 2021 10:32:10 +0800
Subject: [PATCH 2/2] [TD-6217]<enhance>: optimized parsing function

---
 src/plugins/http/src/httpParser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/http/src/httpParser.c b/src/plugins/http/src/httpParser.c
index 25ba096417..62b1737f6f 100644
--- a/src/plugins/http/src/httpParser.c
+++ b/src/plugins/http/src/httpParser.c
@@ -663,7 +663,7 @@ static int32_t httpParserOnTarget(HttpParser *parser, HTTP_PARSER_STATE state, c
   HttpContext *pContext = parser->pContext;
   int32_t      ok = 0;
   do {
-    if (!isspace(c) && c != '\r' && c != '\n') {
+    if (!isspace(c)) {
       if (httpAppendString(&parser->str, &c, 1)) {
         httpError("context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom", pContext, pContext->fd, state, c, c);
         ok = -1;
@@ -1158,7 +1158,7 @@ static int32_t httpParseChar(HttpParser *parser, const char c, int32_t *again) {
   }
 
   if (ok != 0) {
-    pContext->error = 1;
+    pContext->error = true;
   }
 
   return ok;