Merge pull request #8637 from taosdata/feature/TS-602

[TS-602]<enhance>: added HTTP header "Connection: close" if 4xx/5xx were returned

src/plugins/http/inc/httpInt.h

@@ -147,7 +147,7 @@ typedef struct HttpContext {
   int32_t            state;
   uint8_t            reqType;
   uint8_t            parsed;
-  uint8_t            error;
+  bool               error;
   char               ipstr[22];
   char               user[TSDB_USER_LEN];  // parsed from auth token or login message
   char               pass[HTTP_PASSWORD_LEN];

src/plugins/http/src/httpContext.c

@@ -120,6 +120,7 @@ HttpContext *httpCreateContext(SOCKET fd) {
   pContext->lastAccessTime = taosGetTimestampSec();
   pContext->state = HTTP_CONTEXT_STATE_READY;
   pContext->parser = httpCreateParser(pContext);
+  pContext->error = false;
 
   TSDB_CACHE_PTR_TYPE handleVal = (TSDB_CACHE_PTR_TYPE)pContext;
   HttpContext **ppContext = taosCachePut(tsHttpServer.contextCache, &handleVal, sizeof(TSDB_CACHE_PTR_TYPE), &pContext,

src/plugins/http/src/httpResp.c

@@ -24,7 +24,7 @@
 
 const char *httpKeepAliveStr[] = {"", "Connection: Keep-Alive\r\n", "Connection: Close\r\n"};
 
-const char *httpVersionStr[] = {"HTTP/1.0", "HTTP/1.1", "HTTP/1.2"};
+const char *httpVersionStr[] = {"HTTP/1.0", "HTTP/1.1", "HTTP/2.0"}; /* There is no version 1.2 */
 
 const char *httpRespTemplate[] = {
     // HTTP_RESPONSE_JSON_OK
@@ -52,8 +52,14 @@ static void httpSendErrorRespImp(HttpContext *pContext, int32_t httpCode, char *
 
   int8_t httpVersion = 0;
   int8_t keepAlive = 0;
+
   if (pContext->parser != NULL) {
     httpVersion = pContext->parser->httpVersion;
+  }
+
+  if (pContext->error == true) {
+    keepAlive = HTTP_KEEPALIVE_DISABLE;
+  } else if (pContext->parser != NULL) {
     keepAlive = pContext->parser->keepAlive;
   }