From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 7 Feb 2008 08:57:07 +0000 (+0000)
Subject: fix return code
X-Git-Tag: release-0.6.26~7
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=d2d673a8f9b07f786b7b7594f7392ca4ad57f1b2;p=nginx.git

fix return code
---

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;
             }
         }
     }