From 7dd8869f154b22f4fdba82bbb02016541ae13147 Mon Sep 17 00:00:00 2001 From: Hakase Date: Fri, 22 Feb 2019 12:44:38 +0900 Subject: [PATCH] Latest update - 7457 --- src/core/ngx_slab.c | 3 +-- src/http/ngx_http_upstream.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/ngx_slab.c b/src/core/ngx_slab.c index 4023870..b8577ce 100644 --- a/src/core/ngx_slab.c +++ b/src/core/ngx_slab.c @@ -635,10 +635,9 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p) goto fail; } - n = ((u_char *) p - pool->start) >> ngx_pagesize_shift; size = slab & ~NGX_SLAB_PAGE_START; - ngx_slab_free_pages(pool, &pool->pages[n], size); + ngx_slab_free_pages(pool, page, size); ngx_slab_junk(p, size << ngx_pagesize_shift); diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 9071055..a7391d0 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -850,7 +850,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u) ngx_http_file_cache_create_key(r); - if (r->cache->header_start + 256 >= u->conf->buffer_size) { + if (r->cache->header_start + 256 > u->conf->buffer_size) { ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "%V_buffer_size %uz is not enough for cache key, " "it should be increased to at least %uz",