Mercurial > hg > nginx

comparison src/http/modules/ngx_http_limit_conn_module.c @ 4852:9be0b6b749ae stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4785, r4795, r4811, r4812, r4816, r4822: coverity. *) Resolver: fixed possible memory leak in ngx_resolver_create(). *) Explicitly ignore returned value from unlink() in ngx_open_tempfile(). *) Explicitly ignore returned value from close() in ngx_event_core_init_conf(). *) Added three missing checks for NULL after ngx_array_push() calls. *) Crypt: fixed handling of corrupted SSHA entries in password file. *) Mark logically dead code with corresponding comment. Found by / prodded by Coverity.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 24 Sep 2012 18:54:28 +0000
parents ad072e83f2a9
children 9f4cdc7a8578
comparison
equal deleted inserted replaced
4851:6173853dd782 4852:9be0b6b749ae
719 "connection limit must be less 65536"); 719 "connection limit must be less 65536");
720 return NGX_CONF_ERROR; 720 return NGX_CONF_ERROR;
721 } 721 }
722 722
723 limit = ngx_array_push(&lccf->limits); 723 limit = ngx_array_push(&lccf->limits);
724 if (limit == NULL) {
725 return NGX_CONF_ERROR;
726 }
727
724 limit->conn = n; 728 limit->conn = n;
725 limit->shm_zone = shm_zone; 729 limit->shm_zone = shm_zone;
726 730
727 return NGX_CONF_OK; 731 return NGX_CONF_OK;
728 } 732 }