IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix segfaults

Browse Source
This commit is contained in:
Igor Sysoev 2007-01-03 15:43:01 +00:00
parent 3364dc6eb7
commit b94b180181
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ngx_cycle.c
View File

@ -1031,14 +1031,16 @@ ngx_shared_memory_add(ngx_conf_t *cf, ngx_str_t *name, size_t size, void *tag)
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\" "
"conflicts with already declared size %uz"); "conflicts with already declared size %uz",
size, &shm_zone[i].name, shm_zone[i].shm.size);
return NULL; return NULL;
} }
if (tag != shm_zone[i].tag) { if (tag != shm_zone[i].tag) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the shared memory zone \"%V\" is " "the shared memory zone \"%V\" is "
"already declared for a different use"); "already declared for a different use",
&shm_zone[i].name);
return NULL; return NULL;
} }