# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1202374627 0
# Node ID 10ab4a7f92fef8e1e62e92af9531d47f5b3e1366
# Parent  d8de75fe31ec8a76d7ed24da670d2d4183dfa0ce
fix return code

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
--- 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 
         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;
             }
         }
     }