Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7457

Browse Source
This commit is contained in:
Hakase
2019-02-22 12:44:38 +09:00
parent 90bc6bc527
commit 7dd8869f15
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/ngx_slab.c
+1 -2
View File
@@ -635,10 +635,9 @@ ngx_slab_free_locked(ngx_slab_pool_t *pool, void *p)
goto fail; goto fail;
} }
n = ((u_char *) p - pool->start) >> ngx_pagesize_shift;
size = slab & ~NGX_SLAB_PAGE_START; 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); ngx_slab_junk(p, size << ngx_pagesize_shift);
src/http/ngx_http_upstream.c
+1 -1
View File
@@ -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); 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, ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"%V_buffer_size %uz is not enough for cache key, " "%V_buffer_size %uz is not enough for cache key, "
"it should be increased to at least %uz", "it should be increased to at least %uz",