From d9c04b18e9b96a888e363210b8b903e19735ec7d Mon Sep 17 00:00:00 2001
From: freemine <freemine@yeah.net>
Date: Sat, 1 Aug 2020 10:59:12 +0800
Subject: [PATCH] elog to util; parser.data.pos

---
 src/plugins/http/src/httpContext.c | 13 ++++++++++---
 src/plugins/http/src/httpServer.c  | 25 ++++++++++++++++++++++++-
 src/{common => util}/inc/elog.h    |  0
 src/{common => util}/src/elog.c    |  0
 4 files changed, 34 insertions(+), 4 deletions(-)
 rename src/{common => util}/inc/elog.h (100%)
 rename src/{common => util}/src/elog.c (100%)

diff --git a/src/plugins/http/src/httpContext.c b/src/plugins/http/src/httpContext.c
index 4e235e24e8..1e36fdef75 100644
--- a/src/plugins/http/src/httpContext.c
+++ b/src/plugins/http/src/httpContext.c
@@ -55,6 +55,7 @@ static void httpRemoveContextFromEpoll(HttpContext *pContext) {
 
 static void httpDestroyContext(void *data) {
   HttpContext *pContext = *(HttpContext **)data;
+  D("==context[%p] destroyed==", pContext);
   if (pContext->fd > 0) tclose(pContext->fd);
 
   HttpThread *pThread = pContext->pThread;
@@ -80,6 +81,7 @@ bool httpInitContexts() {
     httpError("failed to init context cache");
     return false;
   }
+  D("==cache [%p] created==", tsHttpServer.contextCache);
 
   return true;
 }
@@ -120,6 +122,8 @@ HttpContext *httpCreateContext(int32_t fd) {
   HttpContext *pContext = calloc(1, sizeof(HttpContext));
   if (pContext == NULL) return NULL;
 
+  D("==context[%p] created==", pContext);
+
   pContext->fd = fd;
   pContext->httpVersion = HTTP_VERSION_10;
   pContext->lastAccessTime = taosGetTimestampSec();
@@ -209,6 +213,7 @@ bool httpInitContext(HttpContext *pContext) {
 }
 
 void httpCloseContextByApp(HttpContext *pContext) {
+  D("==");
   pContext->parsed = false;
   bool keepAlive = true;
 
@@ -220,6 +225,7 @@ void httpCloseContextByApp(HttpContext *pContext) {
   }
 
   if (keepAlive) {
+    D("==keepAlive==");
     if (httpAlterContextState(pContext, HTTP_CONTEXT_STATE_HANDLING, HTTP_CONTEXT_STATE_READY)) {
       httpDebug("context:%p, fd:%d, ip:%s, last state:handling, keepAlive:true, reuse context", pContext, pContext->fd,
                 pContext->ipstr);
@@ -240,6 +246,7 @@ void httpCloseContextByApp(HttpContext *pContext) {
                 pContext->ipstr, httpContextStateStr(pContext->state), pContext->state);
     }
   } else {
+    D("==not keepAlive==");
     httpRemoveContextFromEpoll(pContext);
     httpDebug("context:%p, fd:%d, ip:%s, last state:%s:%d, keepAlive:false, close context", pContext, pContext->fd,
               pContext->ipstr, httpContextStateStr(pContext->state), pContext->state);
@@ -365,9 +372,7 @@ static void on_body(void *arg, const char *chunk, size_t len) {
 
   if (pParser->failed) return;
 
-  if (!pContext->parsed) {
-    pContext->parsed = true;
-  }
+  if (pParser->data.pos == 0) pParser->data.pos = pParser->pLast;
 
   A("not implemented yet");
 }
@@ -378,6 +383,8 @@ static void on_end(void *arg) {
 
   if (pParser->failed) return;
 
+  if (pParser->data.pos == 0) pParser->data.pos = pParser->pLast;
+
   if (!pContext->parsed) {
     pContext->parsed = true;
   }
diff --git a/src/plugins/http/src/httpServer.c b/src/plugins/http/src/httpServer.c
index d0b01c628c..d21fa89d5c 100644
--- a/src/plugins/http/src/httpServer.c
+++ b/src/plugins/http/src/httpServer.c
@@ -138,7 +138,7 @@ static bool httpDecompressData(HttpContext *pContext) {
 }
 
 static bool httpReadData(HttpContext *pContext) {
-  if (1) return ehttpReadData(pContext);
+  if (0) return ehttpReadData(pContext);
 
   if (!pContext->parsed) {
     httpInitContext(pContext);
@@ -447,6 +447,29 @@ static bool ehttpReadData(HttpContext *pContext) {
       httpNotifyContextClose(pContext);
       return false;
     }
+    if (pContext->parsed) {
+      int ret = httpCheckReadCompleted(pContext);
+      if (ret == HTTP_CHECK_BODY_CONTINUE) {
+        //httpDebug("context:%p, fd:%d, ip:%s, not finished yet, wait another event", pContext, pContext->fd, pContext->ipstr);
+        httpReleaseContext(pContext);
+        return false;
+      } else if (ret == HTTP_CHECK_BODY_SUCCESS){
+        httpDebug("context:%p, fd:%d, ip:%s, thread:%s, read size:%d, dataLen:%d",
+                  pContext, pContext->fd, pContext->ipstr, pContext->pThread->label, pContext->parser.bufsize, pContext->parser.data.len);
+        if (httpDecompressData(pContext)) {
+          return true;
+        } else {
+          httpNotifyContextClose(pContext);
+          httpReleaseContext(pContext);
+          return false;
+        }
+      } else {
+        httpError("context:%p, fd:%d, ip:%s, failed to read http body, close connect", pContext, pContext->fd, pContext->ipstr);
+        httpNotifyContextClose(pContext);
+        httpReleaseContext(pContext);
+        return false;
+      }
+    }
     return pContext->parsed;
   } else if (nread < 0) {
     if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
diff --git a/src/common/inc/elog.h b/src/util/inc/elog.h
similarity index 100%
rename from src/common/inc/elog.h
rename to src/util/inc/elog.h
diff --git a/src/common/src/elog.c b/src/util/src/elog.c
similarity index 100%
rename from src/common/src/elog.c
rename to src/util/src/elog.c
-- 
GitLab