修改FETCH API函数名为tango_cache_fetch_object;增加DELETE API;调整ctx结构体内部结构;
This commit is contained in:
208
cache/tango_cache_transfer.cpp
vendored
208
cache/tango_cache_transfer.cpp
vendored
@@ -36,10 +36,10 @@ static size_t curl_put_multipart_header_cb(void *ptr, size_t size, size_t count,
|
||||
etag = (struct multipart_etag_list *)malloc(sizeof(struct multipart_etag_list));
|
||||
totallen = end - start + 1;
|
||||
etag->etag = (char *)malloc(totallen + 1);
|
||||
etag->part_number = ctx->part_index;
|
||||
etag->part_number = ctx->put.part_index;
|
||||
memcpy(etag->etag, start, totallen);
|
||||
*(etag->etag + totallen) = '\0';
|
||||
TAILQ_INSERT_TAIL(&ctx->cache_head, etag, node);
|
||||
TAILQ_INSERT_TAIL(&ctx->put.etag_head, etag, node);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,19 +78,19 @@ static size_t curl_put_multipart_send_cb(void *ptr, size_t size, size_t count, v
|
||||
size_t len, space=size*count, send_len;
|
||||
struct tango_cache_ctx *ctx = (struct tango_cache_ctx *)userp;
|
||||
|
||||
if(size==0 || count==0 || ctx->upload_offset>=ctx->upload_length)
|
||||
if(size==0 || count==0 || ctx->put.upload_offset>=ctx->put.upload_length)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
len = ctx->upload_length - ctx->upload_offset;
|
||||
len = ctx->put.upload_length - ctx->put.upload_offset;
|
||||
if(len > space)
|
||||
{
|
||||
len = space;
|
||||
}
|
||||
send_len = evbuffer_remove(ctx->evbuffer, ptr, len);
|
||||
send_len = evbuffer_remove(ctx->put.evbuf, ptr, len);
|
||||
assert(send_len>0);
|
||||
ctx->upload_offset += send_len;
|
||||
ctx->put.upload_offset += send_len;
|
||||
ctx->instance->statistic.memory_used -= send_len;
|
||||
|
||||
return send_len;
|
||||
@@ -107,14 +107,14 @@ static int http_put_bodypart_request_evbuf(struct tango_cache_ctx *ctx, bool ful
|
||||
return -1;
|
||||
}
|
||||
|
||||
ctx->upload_offset = 0;
|
||||
ctx->put.upload_offset = 0;
|
||||
if(full)
|
||||
{
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key);
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s?partNumber=%d&uploadId=%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key, ++ctx->part_index, ctx->uploadID);
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s?partNumber=%d&uploadId=%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key, ++ctx->put.part_index, ctx->put.uploadID);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_HEADERFUNCTION, curl_put_multipart_header_cb);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_HEADERDATA, ctx);
|
||||
}
|
||||
@@ -132,7 +132,7 @@ static int http_put_bodypart_request_evbuf(struct tango_cache_ctx *ctx, bool ful
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_LOW_SPEED_LIMIT, 100L);
|
||||
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_UPLOAD, 1L);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_INFILESIZE, ctx->upload_length);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_INFILESIZE, ctx->put.upload_length);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_READFUNCTION, curl_put_multipart_send_cb);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_READDATA, ctx);
|
||||
|
||||
@@ -199,14 +199,14 @@ int curl_get_minio_uploadID(struct tango_cache_ctx *ctx)
|
||||
return 1;
|
||||
}
|
||||
|
||||
bool cache_delete_minio_object(struct tango_cache_ctx *ctx)
|
||||
int cache_delete_minio_object(struct tango_cache_ctx *ctx)
|
||||
{
|
||||
CURLMcode rc;
|
||||
char minio_url[256];
|
||||
|
||||
if(NULL == (ctx->curl=curl_easy_init()))
|
||||
{
|
||||
return false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key);
|
||||
@@ -223,7 +223,7 @@ bool cache_delete_minio_object(struct tango_cache_ctx *ctx)
|
||||
|
||||
rc = curl_multi_add_handle(ctx->instance->multi_hd, ctx->curl);
|
||||
assert(rc==CURLM_OK);
|
||||
return true;
|
||||
return 1;
|
||||
}
|
||||
|
||||
//return value: true-<2D>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD>false-δ<><CEB4><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>
|
||||
@@ -237,7 +237,7 @@ bool cache_cancel_upload_minio(struct tango_cache_ctx *ctx)
|
||||
return false;
|
||||
}
|
||||
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s?uploadId=%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key, ctx->uploadID);
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s?uploadId=%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key, ctx->put.uploadID);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_URL, minio_url);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_USERAGENT, "aws-sdk-cpp/1.5.24 Linux/3.10.0-327.el7.x86_64 x86_64 pangu_cache");
|
||||
@@ -265,9 +265,9 @@ bool cache_kick_combine_minio(struct tango_cache_ctx *ctx)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
construct_complete_xml(ctx, &ctx->combine_xml, &len);
|
||||
construct_complete_xml(ctx, &ctx->put.combine_xml, &len);
|
||||
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s?uploadId=%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key, ctx->uploadID);
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s?uploadId=%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key, ctx->put.uploadID);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_POST, 1L);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_URL, minio_url);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_USERAGENT, "aws-sdk-cpp/1.5.24 Linux/3.10.0-327.el7.x86_64 x86_64 pangu_cache");
|
||||
@@ -279,7 +279,7 @@ bool cache_kick_combine_minio(struct tango_cache_ctx *ctx)
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_FOLLOWLOCATION, 1L);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_CONNECTTIMEOUT_MS, 500L);
|
||||
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_POSTFIELDS, ctx->combine_xml);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_POSTFIELDS, ctx->put.combine_xml);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_POSTFIELDSIZE, len); //<2F><><EFBFBD><EFBFBD>Content-Length
|
||||
|
||||
if(ctx->headers != NULL)
|
||||
@@ -300,17 +300,17 @@ bool cache_kick_upload_minio_multipart(struct tango_cache_ctx *ctx, size_t block
|
||||
{
|
||||
int ret = 1;
|
||||
|
||||
switch(ctx->put_state)
|
||||
switch(ctx->put.state)
|
||||
{
|
||||
case PUT_STATE_START:
|
||||
ctx->put_state = PUT_STATE_WAIT_START;
|
||||
ctx->put.state = PUT_STATE_WAIT_START;
|
||||
ret = curl_get_minio_uploadID(ctx);
|
||||
break;
|
||||
|
||||
case PUT_STATE_PART:
|
||||
if(ctx->curl == NULL)
|
||||
{
|
||||
ctx->upload_length = block_len;
|
||||
ctx->put.upload_length = block_len;
|
||||
ret = http_put_bodypart_request_evbuf(ctx, false);
|
||||
}
|
||||
break;
|
||||
@@ -331,9 +331,9 @@ int http_put_complete_part_evbuf(struct tango_cache_ctx *ctx)
|
||||
{
|
||||
int ret=0;
|
||||
|
||||
ctx->put_state = PUT_STATE_END;
|
||||
ctx->upload_length = evbuffer_get_length(ctx->evbuffer);
|
||||
if(ctx->upload_length > 0)
|
||||
ctx->put.state = PUT_STATE_END;
|
||||
ctx->put.upload_length = evbuffer_get_length(ctx->put.evbuf);
|
||||
if(ctx->put.upload_length > 0)
|
||||
{
|
||||
ret = http_put_bodypart_request_evbuf(ctx, true);
|
||||
if(ret <= 0)
|
||||
@@ -355,14 +355,14 @@ int cache_kick_upload_minio_end(struct tango_cache_ctx *ctx)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
ctx->close_state = true;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>رգ<D8B1><D5A3>ڲ<EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٹر<D9B9>
|
||||
ctx->put.close_state = true;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>رգ<D8B1><D5A3>ڲ<EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٹر<D9B9>
|
||||
if(ctx->fail_state)
|
||||
{
|
||||
tango_cache_ctx_destroy(ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch(ctx->put_state)
|
||||
switch(ctx->put.state)
|
||||
{
|
||||
case PUT_STATE_START:
|
||||
http_put_complete_part_evbuf(ctx);
|
||||
@@ -371,12 +371,12 @@ int cache_kick_upload_minio_end(struct tango_cache_ctx *ctx)
|
||||
case PUT_STATE_PART:
|
||||
if(ctx->curl == NULL)
|
||||
{
|
||||
ctx->upload_length = evbuffer_get_length(ctx->evbuffer);
|
||||
if(ctx->upload_length == 0)
|
||||
ctx->put.upload_length = evbuffer_get_length(ctx->put.evbuf);
|
||||
if(ctx->put.upload_length == 0)
|
||||
{
|
||||
if(cache_kick_combine_minio(ctx))
|
||||
{
|
||||
ctx->put_state = PUT_STATE_END;
|
||||
ctx->put.state = PUT_STATE_END;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -394,7 +394,7 @@ int cache_kick_upload_minio_end(struct tango_cache_ctx *ctx)
|
||||
ctx->error_code = CACHE_ERR_CURL;
|
||||
if(cache_cancel_upload_minio(ctx))
|
||||
{
|
||||
ctx->put_state = PUT_STATE_CANCEL;
|
||||
ctx->put.state = PUT_STATE_CANCEL;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -413,18 +413,18 @@ int cache_kick_upload_minio_end(struct tango_cache_ctx *ctx)
|
||||
return ret;
|
||||
}
|
||||
|
||||
void tango_cache_curl_put_done(CURL *easy, struct tango_cache_ctx *ctx, CURLcode res, long res_code)
|
||||
void tango_cache_curl_put_done(struct tango_cache_ctx *ctx, CURLcode res, long res_code)
|
||||
{
|
||||
switch(ctx->put_state)
|
||||
switch(ctx->put.state)
|
||||
{
|
||||
case PUT_STATE_WAIT_START:
|
||||
if(res!=CURLE_OK||res_code!=200L|| ctx->fail_state || !parse_uploadID_xml(ctx->response.buff, ctx->response.len, &ctx->uploadID))
|
||||
if(res!=CURLE_OK||res_code!=200L|| ctx->fail_state || !parse_uploadID_xml(ctx->response.buff, ctx->response.len, &ctx->put.uploadID))
|
||||
{
|
||||
easy_string_destroy(&ctx->response);
|
||||
ctx->error_code = CACHE_ERR_CURL;
|
||||
ctx->fail_state = true;
|
||||
if(res != CURLE_OK) MESA_HANDLE_RUNTIME_LOGV2(ctx->instance->runtime_log, RLOG_LV_DEBUG, "%s", ctx->error);
|
||||
if(ctx->close_state)
|
||||
if(ctx->put.close_state)
|
||||
{
|
||||
tango_cache_ctx_destroy(ctx);
|
||||
}
|
||||
@@ -432,14 +432,14 @@ void tango_cache_curl_put_done(CURL *easy, struct tango_cache_ctx *ctx, CURLcode
|
||||
else
|
||||
{
|
||||
easy_string_destroy(&ctx->response);
|
||||
ctx->put_state = PUT_STATE_PART;
|
||||
if(ctx->close_state)
|
||||
ctx->put.state = PUT_STATE_PART;
|
||||
if(ctx->put.close_state)
|
||||
{
|
||||
cache_kick_upload_minio_end(ctx);
|
||||
}
|
||||
else
|
||||
{
|
||||
size_t upload_length = evbuffer_get_length(ctx->evbuffer);
|
||||
size_t upload_length = evbuffer_get_length(ctx->put.evbuf);
|
||||
if(upload_length >= ctx->instance->upload_block_size)
|
||||
{
|
||||
cache_kick_upload_minio_multipart(ctx, upload_length);
|
||||
@@ -459,20 +459,20 @@ void tango_cache_curl_put_done(CURL *easy, struct tango_cache_ctx *ctx, CURLcode
|
||||
{
|
||||
if(cache_cancel_upload_minio(ctx))
|
||||
{
|
||||
ctx->put_state = PUT_STATE_CANCEL;
|
||||
ctx->put.state = PUT_STATE_CANCEL;
|
||||
}
|
||||
else if(ctx->close_state)
|
||||
else if(ctx->put.close_state)
|
||||
{
|
||||
tango_cache_ctx_destroy(ctx);
|
||||
}
|
||||
}
|
||||
else if(ctx->close_state)
|
||||
else if(ctx->put.close_state)
|
||||
{
|
||||
cache_kick_upload_minio_end(ctx);
|
||||
}
|
||||
else
|
||||
{
|
||||
size_t upload_length = evbuffer_get_length(ctx->evbuffer);
|
||||
size_t upload_length = evbuffer_get_length(ctx->put.evbuf);
|
||||
if(upload_length >= ctx->instance->upload_block_size)
|
||||
{
|
||||
cache_kick_upload_minio_multipart(ctx, upload_length);
|
||||
@@ -481,7 +481,7 @@ void tango_cache_curl_put_done(CURL *easy, struct tango_cache_ctx *ctx, CURLcode
|
||||
break;
|
||||
|
||||
case PUT_STATE_CANCEL: //<2F>ȴ<EFBFBD><C8B4>ر<EFBFBD>
|
||||
if(ctx->close_state)
|
||||
if(ctx->put.close_state)
|
||||
{
|
||||
tango_cache_ctx_destroy(ctx);
|
||||
}
|
||||
@@ -514,7 +514,7 @@ int tango_cache_upload_once_start_data(struct tango_cache_ctx *ctx, enum PUT_MEM
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
ctx->put_state = PUT_STATE_END;
|
||||
ctx->put.state = PUT_STATE_END;
|
||||
|
||||
snprintf(minio_url, 256, "http://%s/%s/%s", ctx->instance->minio_hostlist, ctx->instance->bucketname, ctx->object_key);
|
||||
curl_easy_setopt(ctx->curl, CURLOPT_URL, minio_url);
|
||||
@@ -556,18 +556,18 @@ int tango_cache_upload_once_start_evbuf(struct tango_cache_ctx *ctx, enum EVBUFF
|
||||
{
|
||||
size_t size;
|
||||
|
||||
ctx->evbuffer = evbuffer_new();
|
||||
ctx->put.evbuf = evbuffer_new();
|
||||
size = evbuffer_get_length(evbuf);
|
||||
if(way == EVBUFFER_MOVE)
|
||||
{
|
||||
if(evbuffer_add_buffer(ctx->evbuffer, evbuf))
|
||||
if(evbuffer_add_buffer(ctx->put.evbuf, evbuf))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(evbuffer_add_buffer_reference(ctx->evbuffer, evbuf))
|
||||
if(evbuffer_add_buffer_reference(ctx->put.evbuf, evbuf))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
@@ -577,9 +577,18 @@ int tango_cache_upload_once_start_evbuf(struct tango_cache_ctx *ctx, enum EVBUFF
|
||||
return http_put_complete_part_evbuf(ctx);
|
||||
}
|
||||
|
||||
void tango_cache_curl_get_done(CURL *easy, struct tango_cache_ctx *ctx, CURLcode res, long res_code)
|
||||
void tango_cache_curl_del_done(struct tango_cache_ctx *ctx, CURLcode res, long res_code)
|
||||
{
|
||||
switch(ctx->get_state)
|
||||
if(res!=CURLE_OK || (res_code!=204L && res_code!=200L ))
|
||||
{
|
||||
ctx->fail_state = true;
|
||||
}
|
||||
tango_cache_ctx_destroy(ctx);
|
||||
}
|
||||
|
||||
void tango_cache_curl_get_done(struct tango_cache_ctx *ctx, CURLcode res, long res_code)
|
||||
{
|
||||
switch(ctx->get.state)
|
||||
{
|
||||
case GET_STATE_START:
|
||||
if(!ctx->fail_state)
|
||||
@@ -600,7 +609,7 @@ void tango_cache_curl_get_done(CURL *easy, struct tango_cache_ctx *ctx, CURLcode
|
||||
case GET_STATE_DELETE:
|
||||
if(cache_delete_minio_object(ctx))
|
||||
{
|
||||
ctx->get_state = GET_STATE_END;
|
||||
ctx->get.state = GET_STATE_END;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -620,27 +629,28 @@ static size_t curl_get_response_body_cb(void *ptr, size_t size, size_t count, vo
|
||||
struct tango_cache_ctx *ctx = (struct tango_cache_ctx *)userp;
|
||||
struct tango_cache_result result;
|
||||
|
||||
if(ctx->fail_state || ctx->get_state==GET_STATE_DELETE)
|
||||
if(ctx->fail_state || ctx->get.state==GET_STATE_DELETE)
|
||||
{
|
||||
return size*count;
|
||||
}
|
||||
|
||||
if(ctx->need_hdrs!=RESPONSE_HDR_ALL) //<2F><>Expiresʱ
|
||||
if(ctx->get.need_hdrs!=RESPONSE_HDR_ALL) //<2F><>Expiresʱ
|
||||
{
|
||||
ctx->fail_state = true;
|
||||
ctx->error_code = CACHE_ERR_CURL;
|
||||
ctx->get_state = GET_STATE_DELETE;
|
||||
promise_failed(future_to_promise(ctx->future), FUTURE_ERROR_CANCEL, "cache Expires or last-modify not found");
|
||||
ctx->get.state = GET_STATE_DELETE;
|
||||
ctx->instance->statistic.del_recv_num += 1;
|
||||
promise_failed(future_to_promise(ctx->future), FUTURE_ERROR_CANCEL, "cache Expires or x-amz-meta-lm not found");
|
||||
return size*count;
|
||||
}
|
||||
|
||||
if(ctx->response_tag.len > 0)
|
||||
if(ctx->get.response_tag.len > 0)
|
||||
{
|
||||
result.data_frag = ctx->response_tag.buff;
|
||||
result.size = ctx->response_tag.len;
|
||||
result.data_frag = ctx->get.response_tag.buff;
|
||||
result.size = ctx->get.response_tag.len;
|
||||
result.type = RESULT_TYPE_USERTAG;
|
||||
promise_success(future_to_promise(ctx->future), &result);
|
||||
easy_string_destroy(&ctx->response_tag);
|
||||
easy_string_destroy(&ctx->get.response_tag);
|
||||
}
|
||||
if(ctx->response.len > 0)
|
||||
{
|
||||
@@ -661,14 +671,15 @@ static bool check_expires_header(struct tango_cache_ctx *ctx, const char *expire
|
||||
{
|
||||
time_t time_gmt;
|
||||
|
||||
ctx->expires = expires_hdr2timestamp(expires_val, len);
|
||||
ctx->get.expires = expires_hdr2timestamp(expires_val, len);
|
||||
time_gmt = get_gmtime_timestamp(time(NULL));
|
||||
|
||||
if(time_gmt > ctx->expires) //<2F><><EFBFBD><EFBFBD>ʧЧ<CAA7><D0A7>TODO relative_age<67>ĺ<EFBFBD><C4BA><EFBFBD><EFBFBD><EFBFBD>ɶ
|
||||
if(time_gmt > ctx->get.expires) //<2F><><EFBFBD><EFBFBD>ʧЧ<CAA7><D0A7>TODO relative_age<67>ĺ<EFBFBD><C4BA><EFBFBD><EFBFBD><EFBFBD>ɶ
|
||||
{
|
||||
ctx->fail_state = true;
|
||||
ctx->error_code = CACHE_TIMEOUT;
|
||||
ctx->get_state = GET_STATE_DELETE; //<2F><><EFBFBD><EFBFBD>ʧЧʱ<D0A7><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
ctx->get.state = GET_STATE_DELETE; //<2F><><EFBFBD><EFBFBD>ʧЧʱ<D0A7><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
ctx->instance->statistic.del_recv_num += 1;
|
||||
easy_string_destroy(&ctx->response);
|
||||
promise_failed(future_to_promise(ctx->future), FUTURE_ERROR_CANCEL, "cache not fresh");
|
||||
return false;
|
||||
@@ -680,11 +691,11 @@ static bool check_fresh_header(struct tango_cache_ctx *ctx)
|
||||
{
|
||||
time_t now_gmt;
|
||||
|
||||
if(ctx->need_hdrs != RESPONSE_HDR_ALL)
|
||||
if(ctx->get.need_hdrs != RESPONSE_HDR_ALL)
|
||||
return true;
|
||||
|
||||
now_gmt = get_gmtime_timestamp(time(NULL));
|
||||
if(ctx->last_modify+ctx->max_age > now_gmt || now_gmt+ctx->min_fresh>ctx->expires)
|
||||
if(ctx->get.last_modify+ctx->get.max_age > now_gmt || now_gmt+ctx->get.min_fresh>ctx->get.expires)
|
||||
{
|
||||
ctx->fail_state = true;
|
||||
ctx->error_code = CACHE_TIMEOUT;
|
||||
@@ -716,8 +727,9 @@ static size_t curl_get_response_header_cb(void *ptr, size_t size, size_t count,
|
||||
char *start=(char *)ptr, *pos_colon;
|
||||
size_t raw_len = size*count, hdrlen=size*count;
|
||||
char usertag[2048];
|
||||
size_t datalen;
|
||||
|
||||
if(ctx->fail_state || ctx->get_state==GET_STATE_DELETE)
|
||||
if(ctx->fail_state || ctx->get.state==GET_STATE_DELETE)
|
||||
{
|
||||
return raw_len;
|
||||
}
|
||||
@@ -725,49 +737,51 @@ static size_t curl_get_response_header_cb(void *ptr, size_t size, size_t count,
|
||||
{
|
||||
return raw_len;
|
||||
}
|
||||
|
||||
if((pos_colon=(char*)memchr(start, ':', raw_len))!=NULL)
|
||||
pos_colon = (char*)memchr(start, ':', raw_len);
|
||||
if(pos_colon == NULL)
|
||||
{
|
||||
size_t datalen = pos_colon - start;
|
||||
switch(datalen)
|
||||
{
|
||||
case 7:
|
||||
if(strcmp_one_word_mesa_equal_len("expires", "EXPIRES", start, 7))
|
||||
return raw_len;
|
||||
}
|
||||
|
||||
datalen = pos_colon - start;
|
||||
switch(datalen)
|
||||
{
|
||||
case 7:
|
||||
if(strcmp_one_word_mesa_equal_len("expires", "EXPIRES", start, 7))
|
||||
{
|
||||
ctx->get.need_hdrs |= RESPONSE_HDR_EXPIRES;
|
||||
if(!check_expires_header(ctx, pos_colon + 1, raw_len - datalen - 1) || !check_fresh_header(ctx))
|
||||
{
|
||||
ctx->need_hdrs |= RESPONSE_HDR_EXPIRES;
|
||||
if(!check_expires_header(ctx, pos_colon + 1, raw_len - datalen - 1) || !check_fresh_header(ctx))
|
||||
{
|
||||
return raw_len;
|
||||
}
|
||||
return raw_len;
|
||||
}
|
||||
break;
|
||||
case 13:
|
||||
if(strcmp_one_word_mesa_equal_len("x-amz-meta-lm", "X-AMZ-META-LM", start, 13))
|
||||
}
|
||||
break;
|
||||
case 13:
|
||||
if(strcmp_one_word_mesa_equal_len("x-amz-meta-lm", "X-AMZ-META-LM", start, 13))
|
||||
{
|
||||
ctx->get.need_hdrs |= RESPONSE_HDR_LAST_MOD;
|
||||
sscanf(pos_colon+1, "%lu", &ctx->get.last_modify);
|
||||
if(!check_fresh_header(ctx))
|
||||
{
|
||||
ctx->need_hdrs |= RESPONSE_HDR_LAST_MOD;
|
||||
sscanf(pos_colon+1, "%lu", &ctx->last_modify);
|
||||
if(!check_fresh_header(ctx))
|
||||
{
|
||||
return raw_len;
|
||||
}
|
||||
return raw_len;
|
||||
}
|
||||
break;
|
||||
case 15:
|
||||
if(strcmp_one_word_mesa_equal_len("x-amz-meta-user", "X-AMZ-META-USER", start, 15))
|
||||
}
|
||||
break;
|
||||
case 15:
|
||||
if(strcmp_one_word_mesa_equal_len("x-amz-meta-user", "X-AMZ-META-USER", start, 15))
|
||||
{
|
||||
if((hdrlen = Base64_DecodeBlock((unsigned char*)pos_colon+1, raw_len-datalen-1, (unsigned char*)usertag, 2048))>0)
|
||||
{
|
||||
if((hdrlen = Base64_DecodeBlock((unsigned char*)pos_colon+1, raw_len-datalen-1, (unsigned char*)usertag, 2048))>0)
|
||||
{
|
||||
easy_string_savedata(&ctx->response_tag, usertag, hdrlen);
|
||||
}
|
||||
easy_string_savedata(&ctx->get.response_tag, usertag, hdrlen);
|
||||
}
|
||||
break;
|
||||
case 11: if(strcmp_one_word_mesa_equal_len("content-md5", "CONTENT-MD5", start, 11)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
case 12: if(strcmp_one_word_mesa_equal_len("content-type", "CONTENT-TYPE", start, 12)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
case 14: if(strcmp_one_word_mesa_equal_len("content-length", "CONTENT-LENGTH", start, 14)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
case 16: if(strcmp_one_word_mesa_equal_len("content-encoding", "CONTENT-ENCODING", start, 16)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
case 19: if(strcmp_one_word_mesa_equal_len("content-disposition", "CONTENT-DISPOSITION", start, 19)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 11: if(strcmp_one_word_mesa_equal_len("content-md5", "CONTENT-MD5", start, 11)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
case 12: if(strcmp_one_word_mesa_equal_len("content-type", "CONTENT-TYPE", start, 12)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
case 14: if(strcmp_one_word_mesa_equal_len("content-length", "CONTENT-LENGTH", start, 14)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
case 16: if(strcmp_one_word_mesa_equal_len("content-encoding", "CONTENT-ENCODING", start, 16)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
case 19: if(strcmp_one_word_mesa_equal_len("content-disposition", "CONTENT-DISPOSITION", start, 19)) easy_string_savedata(&ctx->response, (const char*)ptr, raw_len); break;
|
||||
default: break;
|
||||
}
|
||||
return raw_len;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user