diff options
author | Sergey Kandaurov <pluknet@nginx.com> | 2020-07-13 15:34:22 +0300 |
---|---|---|
committer | Sergey Kandaurov <pluknet@nginx.com> | 2020-07-13 15:34:22 +0300 |
commit | 2346ee29e1333c20b9a9f9e5ea73940237fbff02 (patch) | |
tree | 9f7249e4871fe9a13799df5e16abbaa2ebd065ff /src/http/ngx_http.c | |
parent | 3db00b4da74ddc0872be4cdb836aaff7fc21272a (diff) | |
parent | 1b2f040a1f82dfd3b30d3b67ea57b3bf1d723d4d (diff) | |
download | nginx-2346ee29e1333c20b9a9f9e5ea73940237fbff02.tar.gz nginx-2346ee29e1333c20b9a9f9e5ea73940237fbff02.zip |
Merged with the default branch.
Diffstat (limited to 'src/http/ngx_http.c')
-rw-r--r-- | src/http/ngx_http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 0a645722c..7da64f906 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1493,14 +1493,14 @@ ngx_http_server_names(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf, NGX_HASH_WILDCARD_KEY); if (rc == NGX_ERROR) { - return NGX_ERROR; + goto failed; } if (rc == NGX_DECLINED) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "invalid server name or wildcard \"%V\" on %V", &name[n].name, &addr->opt.addr_text); - return NGX_ERROR; + goto failed; } if (rc == NGX_BUSY) { |