Merge branch '2.0' into test/test_ci_skip_2.0

.drone.yml

@@ -150,7 +150,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
 name: build_trusty
@@ -177,7 +176,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
 name: build_xenial
@@ -203,7 +201,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 
 ---
 kind: pipeline
@@ -229,7 +226,6 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
 ---
 kind: pipeline
 name: build_centos7
@@ -253,4 +249,4 @@ steps:
     branch:
     - develop
     - master
-    - 2.0
\ No newline at end of file
+

Jenkinsfile

@@ -5,7 +5,9 @@ node {
     git url: 'https://github.com/taosdata/TDengine.git'
 }
 
+
 def skipbuild=0
+
 def abortPreviousBuilds() {
   def currentJobName = env.JOB_NAME
   def currentBuildNumber = env.BUILD_NUMBER.toInteger()
@@ -123,7 +125,6 @@ pipeline {
           agent{label 'master'}
           when {
               changeRequest()
-              
           }
           steps {
             script{
@@ -155,10 +156,12 @@ pipeline {
           git checkout -qf FETCH_HEAD
           '''     
           
+
           script{  
             skipbuild='2'     
             skipbuild=sh(script: "git log -2 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]' && echo 1 || echo 2", returnStdout:true)
             println skipbuild
+
           }
           sh'''
           rm -rf ${WORKSPACE}.tes
@@ -173,7 +176,6 @@ pipeline {
               changeRequest()
                expression{
                 return skipbuild.trim() == '2'
-
               }
             }
           }

src/plugins/http/src/httpUtil.c

@@ -188,7 +188,7 @@ bool httpMallocMultiCmds(HttpContext *pContext, int32_t cmdSize, int32_t bufferS
 bool httpReMallocMultiCmdsSize(HttpContext *pContext, int32_t cmdSize) {
   HttpSqlCmds *multiCmds = pContext->multiCmds;
 
-  if (cmdSize <= 0 && cmdSize > HTTP_MAX_CMD_SIZE) {
+  if (cmdSize <= 0 || cmdSize > HTTP_MAX_CMD_SIZE) {
     httpError("context:%p, fd:%d, user:%s, mulitcmd size:%d large then %d", pContext, pContext->fd, pContext->user,
               cmdSize, HTTP_MAX_CMD_SIZE);
     return false;