Mercurial > hg > nginx

diff src/event/modules/ngx_epoll_module.c @ 3237:2efa8d2fcde1 stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r2903, r2911, r2912, r3002: fix various failures handling
author Igor Sysoev <igor@sysoev.ru>
date Mon, 26 Oct 2009 15:54:29 +0000
parents 90312b616162
children a66d6dfd53f1 e1409e56ba7c
line wrap: on
line diff
--- a/src/event/modules/ngx_epoll_module.c	Mon Oct 26 15:46:59 2009 +0000
+++ b/src/event/modules/ngx_epoll_module.c	Mon Oct 26 15:54:29 2009 +0000
@@ -552,7 +552,7 @@
 
     epcf = ngx_palloc(cycle->pool, sizeof(ngx_epoll_conf_t));
     if (epcf == NULL) {
-        return NGX_CONF_ERROR;
+        return NULL;
     }
 
     epcf->events = NGX_CONF_UNSET;