From 69211eb8c776856022e4c162c376dd50694fb0eb Mon Sep 17 00:00:00 2001 From: Odin Hultgren Van Der Horst Date: Thu, 28 Oct 2021 15:54:27 +0200 Subject: [PATCH] Removed superfluous code from shdict_store Removed superfluous copy of key, and setting key_len and value_len. --- src/cycle | 0 src/ngx_http_lua_shdict.c | 7 +------ 2 files changed, 1 insertion(+), 6 deletions(-) create mode 100644 src/cycle diff --git a/src/cycle b/src/cycle new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/ngx_http_lua_shdict.c b/src/ngx_http_lua_shdict.c index 8421ac1714..d841eb95ee 100644 --- a/src/ngx_http_lua_shdict.c +++ b/src/ngx_http_lua_shdict.c @@ -1426,8 +1426,6 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key, ngx_queue_remove(&sd->queue); ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue); - sd->key_len = (u_short) key_len; - if (exptime > 0) { tp = ngx_timeofday(); sd->expires = (uint64_t) tp->sec * 1000 + tp->msec @@ -1439,14 +1437,11 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key, sd->user_flags = user_flags; - sd->value_len = (uint32_t) str_value_len; - dd("setting value type to %d", value_type); sd->value_type = (uint8_t) value_type; - p = ngx_copy(sd->data, key, key_len); - ngx_memcpy(p, str_value_buf, str_value_len); + ngx_memcpy(sd->data + key_len, str_value_buf, str_value_len); ngx_shmtx_unlock(&ctx->shpool->mutex);