comparison src/event/modules/ngx_devpoll_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 8144200f6fa3
children a66d6dfd53f1 e1409e56ba7c
comparison
equal deleted inserted replaced
3236:9aa8fd2d5a00 3237:2efa8d2fcde1
548 { 548 {
549 ngx_devpoll_conf_t *dpcf; 549 ngx_devpoll_conf_t *dpcf;
550 550
551 dpcf = ngx_palloc(cycle->pool, sizeof(ngx_devpoll_conf_t)); 551 dpcf = ngx_palloc(cycle->pool, sizeof(ngx_devpoll_conf_t));
552 if (dpcf == NULL) { 552 if (dpcf == NULL) {
553 return NGX_CONF_ERROR; 553 return NULL;
554 } 554 }
555 555
556 dpcf->changes = NGX_CONF_UNSET; 556 dpcf->changes = NGX_CONF_UNSET;
557 dpcf->events = NGX_CONF_UNSET; 557 dpcf->events = NGX_CONF_UNSET;
558 558