Merge of r4153:
Better handling of late upstream creation. Configuration with duplicate upstream blocks defined after first use, i.e. like server { ... location / { proxy_pass http://backend; } } upstream backend { ... } upstream backend { ... } now correctly results in "duplicate upstream" error. Additionally, upstream blocks defined after first use now handle various server directive parameters ("weight", "max_fails", etc.). Previously configuration like server { ... location / { proxy_pass http://backend; } } upstream backend { server 127.0.0.1 max_fails=5; } incorrectly resulted in "invalid parameter "max_fails=5"" error.
This commit is contained in:
parent
a96d698a88
commit
1f6eddd095
1 changed files with 4 additions and 0 deletions
|
@ -4280,6 +4280,10 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
|
|||
continue;
|
||||
}
|
||||
|
||||
if (flags & NGX_HTTP_UPSTREAM_CREATE) {
|
||||
uscfp[i]->flags = flags;
|
||||
}
|
||||
|
||||
return uscfp[i];
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue