Mercurial > hg > nginx
comparison src/event/modules/ngx_epoll_module.c @ 3237:2efa8d2fcde1 stable-0.7
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 |
comparison
equal
deleted
inserted
replaced
3236:9aa8fd2d5a00 | 3237:2efa8d2fcde1 |
---|---|
550 { | 550 { |
551 ngx_epoll_conf_t *epcf; | 551 ngx_epoll_conf_t *epcf; |
552 | 552 |
553 epcf = ngx_palloc(cycle->pool, sizeof(ngx_epoll_conf_t)); | 553 epcf = ngx_palloc(cycle->pool, sizeof(ngx_epoll_conf_t)); |
554 if (epcf == NULL) { | 554 if (epcf == NULL) { |
555 return NGX_CONF_ERROR; | 555 return NULL; |
556 } | 556 } |
557 | 557 |
558 epcf->events = NGX_CONF_UNSET; | 558 epcf->events = NGX_CONF_UNSET; |
559 | 559 |
560 return epcf; | 560 return epcf; |