Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
KASAKI11
TDengine
提交
7bae0fae
T
TDengine
项目概览
KASAKI11
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7bae0fae
编写于
6月 15, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-571] merge changes of 1.6
上级
20f95567
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
7 addition
and
6 deletion
+7
-6
src/plugins/http/src/httpAuth.c
src/plugins/http/src/httpAuth.c
+1
-0
src/plugins/http/src/httpContext.c
src/plugins/http/src/httpContext.c
+0
-1
src/plugins/http/src/httpServer.c
src/plugins/http/src/httpServer.c
+5
-4
tests/script/general/db/len.sim
tests/script/general/db/len.sim
+1
-1
未找到文件。
src/plugins/http/src/httpAuth.c
浏览文件 @
7bae0fae
...
...
@@ -73,6 +73,7 @@ bool httpParseTaosdAuthToken(HttpContext *pContext, char *token, int len) {
unsigned
char
*
base64
=
base64_decode
(
token
,
len
,
&
outlen
);
if
(
base64
==
NULL
||
outlen
==
0
)
{
httpError
(
"context:%p, fd:%d, ip:%s, taosd token:%s parsed error"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
token
);
if
(
base64
)
free
(
base64
);
return
false
;
}
if
(
outlen
!=
(
TSDB_USER_LEN
+
TSDB_PASSWORD_LEN
))
{
...
...
src/plugins/http/src/httpContext.c
浏览文件 @
7bae0fae
...
...
@@ -68,7 +68,6 @@ bool httpInitContexts() {
}
void
httpCleanupContexts
()
{
// TODO: wait until all context is closed
if
(
tsHttpServer
.
contextCache
!=
NULL
)
{
SCacheObj
*
cache
=
tsHttpServer
.
contextCache
;
httpPrint
(
"context cache is cleanuping, size:%d"
,
taosHashGetSize
(
cache
->
pHashTable
));
...
...
src/plugins/http/src/httpServer.c
浏览文件 @
7bae0fae
...
...
@@ -56,8 +56,9 @@ static void httpStopThread(HttpThread* pThread) {
void
httpCleanUpConnect
()
{
HttpServer
*
pServer
=
&
tsHttpServer
;
pthread_join
(
pServer
->
thread
,
NULL
)
;
if
(
pServer
->
pThreads
==
NULL
)
return
;
pthread_join
(
pServer
->
thread
,
NULL
);
for
(
int
i
=
0
;
i
<
pServer
->
numOfThreads
;
++
i
)
{
HttpThread
*
pThread
=
pServer
->
pThreads
+
i
;
if
(
pThread
!=
NULL
)
{
...
...
@@ -195,9 +196,9 @@ static void httpProcessHttpData(void *param) {
for
(
int
i
=
0
;
i
<
fdNum
;
++
i
)
{
pContext
=
httpGetContext
(
events
[
i
].
data
.
ptr
);
if
(
pContext
==
NULL
)
{
httpError
(
"
fd:%d, is already released, close connect"
,
events
[
i
].
data
.
fd
);
epoll_ctl
(
pThread
->
pollFd
,
EPOLL_CTL_DEL
,
pContext
->
fd
,
NULL
);
tclose
(
events
[
i
].
data
.
fd
);
httpError
(
"
context:%p, is already released, close connect"
,
events
[
i
].
data
.
ptr
);
//epoll_ctl(pThread->pollFd, EPOLL_CTL_DEL, events[i].data.
fd, NULL);
//
tclose(events[i].data.fd);
continue
;
}
...
...
tests/script/general/db/len.sim
浏览文件 @
7bae0fae
...
...
@@ -49,7 +49,7 @@ if $rows != 0 then
endi
print =============== step4
sql create database a012345678901201234567890120123456789012 -x step4
sql create database a012345678901201234567890120123456789012
a012345678901201234567890120123456789012
-x step4
return -1
step4:
sql show databases
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录