gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流式上传主动cancel时会产生promise_fail回调

Browse Source
This commit is contained in:
zhangchengwei
2018-11-25 13:49:39 +08:00
parent bc1907d2c4
commit cb3737d02a
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cache/src/tango_cache_transfer.cpp vendored
View File

@@ -380,7 +380,7 @@ void cache_kick_upload_minio_end(struct tango_cache_ctx *ctx)
tango_cache_set_fail_state(ctx, CACHE_ERR_CURL);
if(cache_cancel_upload_minio(ctx))
{
ctx->put.state = PUT_STATE_ERR_CANCEL;
ctx->put.state = PUT_STATE_CANCEL;
}
else
{
@@ -439,7 +439,7 @@ void tango_cache_curl_put_done(struct tango_cache_ctx *ctx, CURLcode res, long r
{
if(cache_cancel_upload_minio(ctx))
{
ctx->put.state = PUT_STATE_ERR_CANCEL;
ctx->put.state = PUT_STATE_CANCEL;
}
else if(ctx->put.close_state)
{
@@ -460,15 +460,12 @@ void tango_cache_curl_put_done(struct tango_cache_ctx *ctx, CURLcode res, long r
}
break;
case PUT_STATE_ERR_CANCEL: //<2F>ȴ<EFBFBD><C8B4>ر<EFBFBD>
case PUT_STATE_CANCEL: //<2F>ȴ<EFBFBD><C8B4>ر<EFBFBD>
if(ctx->put.close_state)
{
tango_cache_ctx_destroy(ctx);
}
break;
case PUT_STATE_USER_CANCEL:
tango_cache_ctx_destroy(ctx, false);
break;
case PUT_STATE_END:
if(res != CURLE_OK || res_code!=200L)