Klaus Demo nginx / 80824fe
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. Maxim Dounin 10 years ago
1 changed file(s) with 4 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
42794279 continue;
42804280 }
42814281
4282 if (flags & NGX_HTTP_UPSTREAM_CREATE) {
4283 uscfp[i]->flags = flags;
4284 }
4285
42824286 return uscfp[i];
42834287 }
42844288