mirror of
https://github.com/nginx/nginx.git
synced 2025-06-21 21:31:05 +08:00
fix return code
This commit is contained in:
parent
18be913cb6
commit
d2d673a8f9
@ -2912,7 +2912,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||||||
if (conf->resolver == NULL) {
|
if (conf->resolver == NULL) {
|
||||||
conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log);
|
conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log);
|
||||||
if (conf->resolver == NULL) {
|
if (conf->resolver == NULL) {
|
||||||
return NGX_OK;
|
return NGX_CONF_ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user