summaryrefslogtreecommitdiffhomepage
path: root/src/event/ngx_event.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-06-02 16:09:44 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-06-02 16:09:44 +0000
commit260c4321d71806f51d124d79cdff8e8e496a4956 (patch)
treea6fe073d5f57d49b05562f9ce020b3a532c85c8c /src/event/ngx_event.c
parent05822df0cb9dcf9909f4d82be7ce1becd108eeac (diff)
downloadnginx-260c4321d71806f51d124d79cdff8e8e496a4956.tar.gz
nginx-260c4321d71806f51d124d79cdff8e8e496a4956.tar.bz2
return NULL instead of NGX_CONF_ERROR on a create conf failure
Diffstat (limited to 'src/event/ngx_event.c')
-rw-r--r--src/event/ngx_event.c4
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