mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-03 21:18:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: allow shared memory size to be declared after a reference.

Browse Source 
For example, this fixes the case when "proxy_cache_path" is specified
after "proxy_cache" that references it.
This commit is contained in:
Sergey Kandaurov 2015-04-20 16:53:04 +03:00
parent c799c82faa
commit 06ff117986
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_cycle.c
View File

@ -1207,6 +1207,10 @@ ngx_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name, size_t size, void *tag)
return NULL; return NULL;
} }
if (shm_zone[i].shm.size == 0) {
shm_zone[i].shm.size = size;
}
if (size && size != shm_zone[i].shm.size) { if (size && size != shm_zone[i].shm.size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the size %uz of shared memory zone \"%V\" " "the size %uz of shared memory zone \"%V\" "