test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-12-02 03:47:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bugs in async read

Browse Source
This commit is contained in:
zhengshuxin 2019-06-05 16:20:19 +08:00
parent 292287dd77
commit 7b7cfe59f7
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib_protocol/src/http/http_chat_async.c
View File

@ -33,10 +33,10 @@ typedef struct HTTP_CHAT_CTX {
} HTTP_CHAT_CTX;
#define HTTP_LEN_ROUND(_ctx) \
(_ctx->chunk_len > 0 ? \
(_ctx->chunk_len - _ctx->read_cnt > var_http_buf_size ? \
var_http_buf_size : _ctx->chunk_len - _ctx->read_cnt) \
: var_http_buf_size)
(_ctx->chunk_len > 0 ? \
(_ctx->chunk_len > _ctx->read_cnt + var_http_buf_size ? \
var_http_buf_size : _ctx->chunk_len - _ctx->read_cnt) \
: var_http_buf_size)
#if 1
#define DISABLE_READ(x) do { \
@ -287,9 +287,10 @@ static int chunked_data(ACL_ASTREAM *astream, HTTP_CHAT_CTX *ctx)
int dlen, ret;
if (ctx->chunked) {
sbuf = acl_aio_read_peek(astream);
ret = (int) HTTP_LEN_ROUND(ctx);
sbuf = acl_aio_readn_peek(astream, &ret);
} else if (ctx->hdr->content_length <= 0) {
sbuf = acl_aio_read_peek(astream);
sbuf = acl_aio_read_peek(astream, &ret);
} else {
ret = (int) HTTP_LEN_ROUND(ctx);
if (ret <= 0) {
@ -298,14 +299,17 @@ static int chunked_data(ACL_ASTREAM *astream, HTTP_CHAT_CTX *ctx)
*/
DISABLE_READ(astream);
if (notify(HTTP_CHAT_OK, NULL, 0, arg) < 0) {
return (-1);
return -1;
}
return -1;
} else {
sbuf = acl_aio_read_peek(astream);
sbuf = acl_aio_readn_peek(astream, &ret);
}
}
ctx->body_len += ret;
ctx->read_cnt += ret;
if (sbuf == NULL) {
return 0;
}
@ -314,9 +318,6 @@ static int chunked_data(ACL_ASTREAM *astream, HTTP_CHAT_CTX *ctx)
dlen = (int) ACL_VSTRING_LEN(sbuf);
ACL_VSTRING_RESET(sbuf);
ctx->body_len += dlen;
ctx->read_cnt += dlen;
if (ctx->chunk_len > 0 && ctx->read_cnt >= ctx->chunk_len) {
if (!ctx->chunked) {
/* 如果读到完了整块数据且非 CHUNK 传输，
@ -335,6 +336,10 @@ static int chunked_data(ACL_ASTREAM *astream, HTTP_CHAT_CTX *ctx)
return -1;
}
/**
* printf(">>%s: chunk_len=%d, read=%d\r\n", __FUNCTION__,
* (int) ctx->chunk_len, (int) ctx->read_cnt);
*/
/* 设置标志位开始读取块数据体的分隔行数据 */
ctx->status = CHAT_S_CHUNK_SEP;
return 0;