diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 15:54:29 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 15:54:29 +0000 |
| commit | f7f963d7792fdf19ad11888d3a3e7460ea88dfd0 (patch) | |
| tree | 33fa551ca1e0e3d61474dad1bf148de45338b7b7 /src/event/ngx_event.c | |
| parent | df30d3db5655ce895726efd7ddff81f971727dbe (diff) | |
| download | nginx-f7f963d7792fdf19ad11888d3a3e7460ea88dfd0.tar.gz nginx-f7f963d7792fdf19ad11888d3a3e7460ea88dfd0.tar.bz2 | |
merge r2903, r2911, r2912, r3002:
fix various failures handling
Diffstat (limited to 'src/event/ngx_event.c')
| -rw-r--r-- | src/event/ngx_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index e30c5636a..7fc690115 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -1113,7 +1113,7 @@ ngx_event_create_conf(ngx_cycle_t *cycle) ecf = ngx_palloc(cycle->pool, sizeof(ngx_event_conf_t)); if (ecf == NULL) { - return NGX_CONF_ERROR; + return NULL; } ecf->connections = NGX_CONF_UNSET_UINT; @@ -1128,7 +1128,7 @@ ngx_event_create_conf(ngx_cycle_t *cycle) if (ngx_array_init(&ecf->debug_connection, cycle->pool, 4, sizeof(ngx_event_debug_t)) == NGX_ERROR) { - return NGX_CONF_ERROR; + return NULL; } #endif |