summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-02-07 08:57:07 +0000
committerIgor Sysoev <igor@sysoev.ru>2008-02-07 08:57:07 +0000
commitd2d673a8f9b07f786b7b7594f7392ca4ad57f1b2 (patch)
tree57fcadcb85ddfbf01096196cfc188f19a5bfe4c3
parent18be913cb6036c12b40914f3e9e9b0181044bbf7 (diff)
downloadnginx-d2d673a8f9b07f786b7b7594f7392ca4ad57f1b2.tar.gz
nginx-d2d673a8f9b07f786b7b7594f7392ca4ad57f1b2.tar.bz2
fix return code
-rw-r--r--src/http/ngx_http_core_module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 574e92542..84d8cc1f5 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2912,7 +2912,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->resolver == NULL) {
conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log);
if (conf->resolver == NULL) {
- return NGX_OK;
+ return NGX_CONF_ERROR;
}
}
}