Mercurial > hg > nginx-vendor-current
comparison src/core/ngx_cycle.c @ 684:660139fd80ca NGINX_1_3_5
nginx 1.3.5
*) Change: the ngx_http_mp4_module module no longer skips tracks in
formats other than H.264 and AAC.
*) Bugfix: a segmentation fault might occur in a worker process if the
"map" directive was used with variables as values.
*) Bugfix: a segmentation fault might occur in a worker process if the
"geo" directive was used with the "ranges" parameter but without the
"default" parameter; the bug had appeared in 0.8.43.
Thanks to Zhen Chen and Weibin Yao.
*) Bugfix: in the -p command-line parameter handling.
*) Bugfix: in the mail proxy server.
*) Bugfix: of minor potential bugs.
Thanks to Coverity.
*) Bugfix: nginx/Windows could not be built with Visual Studio 2005
Express.
Thanks to HAYASHI Kentaro.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 21 Aug 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children | f31b19fe7f48 |
comparison
equal
deleted
inserted
replaced
683:28cc2a208803 | 684:660139fd80ca |
---|---|
1283 != 0) | 1283 != 0) |
1284 { | 1284 { |
1285 continue; | 1285 continue; |
1286 } | 1286 } |
1287 | 1287 |
1288 if (tag != shm_zone[i].tag) { | |
1289 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
1290 "the shared memory zone \"%V\" is " | |
1291 "already declared for a different use", | |
1292 &shm_zone[i].shm.name); | |
1293 return NULL; | |
1294 } | |
1295 | |
1288 if (size && size != shm_zone[i].shm.size) { | 1296 if (size && size != shm_zone[i].shm.size) { |
1289 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1297 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1290 "the size %uz of shared memory zone \"%V\" " | 1298 "the size %uz of shared memory zone \"%V\" " |
1291 "conflicts with already declared size %uz", | 1299 "conflicts with already declared size %uz", |
1292 size, &shm_zone[i].shm.name, shm_zone[i].shm.size); | 1300 size, &shm_zone[i].shm.name, shm_zone[i].shm.size); |
1293 return NULL; | |
1294 } | |
1295 | |
1296 if (tag != shm_zone[i].tag) { | |
1297 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
1298 "the shared memory zone \"%V\" is " | |
1299 "already declared for a different use", | |
1300 &shm_zone[i].shm.name); | |
1301 return NULL; | 1301 return NULL; |
1302 } | 1302 } |
1303 | 1303 |
1304 return &shm_zone[i]; | 1304 return &shm_zone[i]; |
1305 } | 1305 } |