summaryrefslogtreecommitdiffhomepage
path: root/src/http/modules/ngx_http_log_module.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/http/modules/ngx_http_log_module.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/http/modules/ngx_http_log_module.c')
-rw-r--r--src/http/modules/ngx_http_log_module.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index efe720bf5..170e3a264 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -714,18 +714,18 @@ ngx_http_log_create_main_conf(ngx_conf_t *cf)
conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_main_conf_t));
if (conf == NULL) {
- return NGX_CONF_ERROR;
+ return NULL;
}
if (ngx_array_init(&conf->formats, cf->pool, 4, sizeof(ngx_http_log_fmt_t))
!= NGX_OK)
{
- return NGX_CONF_ERROR;
+ return NULL;
}
fmt = ngx_array_push(&conf->formats);
if (fmt == NULL) {
- return NGX_CONF_ERROR;
+ return NULL;
}
fmt->name.len = sizeof("combined") - 1;
@@ -735,7 +735,7 @@ ngx_http_log_create_main_conf(ngx_conf_t *cf)
fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_http_log_op_t));
if (fmt->ops == NULL) {
- return NGX_CONF_ERROR;
+ return NULL;
}
return conf;
@@ -749,7 +749,7 @@ ngx_http_log_create_loc_conf(ngx_conf_t *cf)
conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_loc_conf_t));
if (conf == NULL) {
- return NGX_CONF_ERROR;
+ return NULL;
}
conf->open_file_cache = NGX_CONF_UNSET_PTR;